From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'

---
 src/main/resources/application.yml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3620ad6..6ad42f0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,7 +20,7 @@
       maxRequestSize: 50MB
 
 mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml,classpath:/mapper/**/*Mapper.xml
+  mapper-locations: classpath:/mapper/*Mapper.xml,classpath:/mapper/**/*Mapper.xml,classpath:/mapper/*Mapper*.xml,classpath:/mapper/**/*Mapper*.xml
   global-config:
     banner: false
     db-config:
@@ -77,14 +77,14 @@
 wechat:
   merchantId: 1661512517
   customer:
-      appid: wx1441324401626290    #小程序appId
-      secret: bab595ac75f60eb33567511111a569a7    #secret
+    appid: wx1441324401626290    #小程序appId
+    secret: bab595ac75f60eb33567511111a569a7    #secret
   partner:
-      appid: wx6d0ecc4e18710458    #小程序appId
-      secret: 22afb006e9b94ee97c47bbfded9151eb     #secret
+    appid: wx6d0ecc4e18710458    #小程序appId
+    secret: 22afb006e9b94ee97c47bbfded9151eb     #secret
   supplier:
-      appid: wx3203fd935a6ffe09    #小程序appId
-      secret: 9121c703fb0c416b21a8c289dd73ae9b     #secret
+    appid: wx3203fd935a6ffe09    #小程序appId
+    secret: 9121c703fb0c416b21a8c289dd73ae9b     #secret
 
 sms:
   verificationCode: SMS_301300012   #验证码通用模版
\ No newline at end of file

--
Gitblit v1.9.3