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"
2
2
git pull --rebase
3
3
4
4
git push origin master
Original file line number Diff line number Diff line change 14
14
<maven .compiler.source>1.8</maven .compiler.source>
15
15
<maven .compiler.target>1.8</maven .compiler.target>
16
16
17
+ <<<<<<< HEAD
17
18
<weixin-java-mp .version>4.6.0</weixin-java-mp .version>
18
19
<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)
19
24
<spring-security .version>5.5.7</spring-security .version>
20
25
<spring-security .version>5.7.12</spring-security .version>
21
26
<guava .version>32.0.0-jre</guava .version>
You can’t perform that action at this time.
0 commit comments