Merge branch 'master' into cc_20250106_v2.4

# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
This commit is contained in:
苏竹红
2025-01-10 18:35:32 +08:00
8 changed files with 26 additions and 21 deletions

View File

@@ -58,7 +58,7 @@ wx.pay.apiV3Key=wxpayzhenghu123JKJHkjafWXCertUt1
wx.pay.payNotifyUrl=https://abstore-api.coolstore.cn/zxjp/mini/wechatPay/payNotify
wx.pay.backNotifyUrl=https://abstore-api.coolstore.cn/zxjp/mini/wechatPay/refundNotify
aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD
aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
aliyun.accessKeyId1=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.accessKeySecret1=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
#aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD
#aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
aliyun.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa