⬆️ 升级sdk版本为4.7.0

Author: binarywang

commit.sh

@@ -1,3 +1,3 @@
-git pull
-git commit -a -m "update wxjava sdk to 4.6.0"
+git commit -a -m ":arrow_up: 升级sdk版本为4.7.0"
+git pull --rebase
 git push origin master

pom.xml

@@ -18,8 +18,13 @@
   <description>微信支付 Demo with Spring Boot</description>
 
   <properties>
+<<<<<<< HEAD
     <weixin-java-pay.version>4.6.0</weixin-java-pay.version>
     <io.springfox.version>2.10.0</io.springfox.version>
+=======
+    <weixin-java-pay.version>4.7.0</weixin-java-pay.version>
+    <io.springfox.version>2.5.0</io.springfox.version>
+>>>>>>> 1d97864 (:arrow_up: 升级sdk版本为4.7.0)
 
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>