Merge branch 'master' of zx/cuspay into master

src/main/resources/application.yml

@@ -93,17 +93,18 @@ mybatis:
         type-aliases-package: com.emato.cuspay
 
 wx: 
-  payment: 
-    declare:
-      url: https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclareorder
-    query:
-      url: https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery
-  notice:
-    count: 2
+    payment:
+        declare:
+            url: https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclareorder
+        query:
+            url: https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery
+
 db:
-  wx:
-    #定时器报关一次区的数据
-    declare:
-      limit: 20
-    notify:
-      limit: 20
+    merch:
+        notice:
+            limit: 20
+            count: 2
+    wx:
+        #定时器报关一次区的数据
+        declare:
+            limit: 20