Merge remote-tracking branch 'origin/dev' into dev

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-local.yml

@@ -93,6 +93,4 @@ wx:
     page: "pages/logs/logs"
     width: 420
     checkPath: true
-    envVersion: release
-  pay:
-    enabled: "false"
+    envVersion: release

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-release.yml

@@ -10,7 +10,6 @@ spring:
         wxpay:
           enabled: "true"
           app-id: "wx12e34630814e5d30"
-          # 15141660511
           mch-id: "1662657667"
           apiv3-key: "Xiangmai20231225Xiangmai20231225"
           cert-serial-no: 6BAA04DCBF80E735518219CC8BCD196BE039F713

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-test.yml

@@ -9,8 +9,7 @@ spring:
         callbackUrl: "https://mpapi.ysyd.cloud/unifiedpay/%s/callback"
         wxpay:
           enabled: "true"
-          app-id: "wxe53a2bd91cc5b4c2"
-          # 15141660511
+          app-id: "wx12e34630814e5d30"
           mch-id: "1662657667"
           apiv3-key: "Xiangmai20231225Xiangmai20231225"
           cert-serial-no: 6BAA04DCBF80E735518219CC8BCD196BE039F713