File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- git commit -a -m " :arrow_up: 升级sdk版本为4.7 .0"
1+ git commit -a -m " :arrow_up: 升级sdk版本为4.8 .0"
22git pull --rebase
33
44git push origin master
5+ git push gitee master
6+
Original file line number Diff line number Diff line change 1414 <maven .compiler.source>1.8</maven .compiler.source>
1515 <maven .compiler.target>1.8</maven .compiler.target>
1616
17- <<<<<<< HEAD
18- <weixin-java-mp .version>4.6.0</weixin-java-mp .version>
19- <spring .version>6.1.14</spring .version>
20- =======
21- <weixin-java-mp .version>4.7.0</weixin-java-mp .version>
17+ <weixin-java-mp .version>4.8.0</weixin-java-mp .version>
2218 <spring .version>6.1.21</spring .version>
23- >>>>>>> 8e89387 (:arrow_up: 升级sdk版本为4.7.0)
2419 <spring-security .version>5.5.7</spring-security .version>
2520 <spring-security .version>5.7.14</spring-security .version>
2621 <guava .version>32.0.0-jre</guava .version>
You can’t perform that action at this time.
0 commit comments