File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change 1- git commit -a -m " :arrow_up: 升级sdk版本为4.6 .0"
1+ git commit -a -m " :arrow_up: 升级sdk版本为4.7 .0"
22git pull --rebase
33
44git push origin master
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
1718 <weixin-java-mp .version>4.6.0</weixin-java-mp .version>
1819 <spring .version>6.1.13</spring .version>
20+ =======
21+ <weixin-java-mp .version>4.7.0</weixin-java-mp .version>
22+ <spring .version>6.0.14</spring .version>
23+ >>>>>>> 8e89387 (:arrow_up: 升级sdk版本为4.7.0)
1924 <spring-security .version>5.5.7</spring-security .version>
2025 <spring-security .version>5.7.12</spring-security .version>
2126 <guava .version>32.0.0-jre</guava .version>
You can’t perform that action at this time.
0 commit comments