Merge branch 'dev/3.1_release_merge' into release/3.1

2026-02-04 17:05:59 +08:00
parent 45dd78032a f2d43f06f4
commit cc506ff7e9
11 changed files with 274 additions and 45 deletions
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -125,9 +125,9 @@ orderList.link=https://develop.aida.com.hk/home/homePage?order=
 # 0 不发送邮件通知 1 发送邮件通知
 stripe.webhook.fail.reminder=0
 # kim test
-stripe.paymentMethodConfiguration=pmc_1LywTWH7nPZ8bkrN6FvdCUWG
+#stripe.paymentMethodConfiguration=pmc_1LywTWH7nPZ8bkrN6FvdCUWG
 # developer test
-#stripe.paymentMethodConfiguration=pmc_1QIKyq02n1TEydyNKVEYvhW7
+stripe.paymentMethodConfiguration=pmc_1QIKyq02n1TEydyNKVEYvhW7
 #thymelea模板配置
 #控制 Thymeleaf 是否启用模板缓存 生产环境用true,以提高性能
 spring.thymeleaf.cache=false
--- a/src/main/resources/mapper/primary/WorkspaceRelStyleMapper.xml
+++ b/src/main/resources/mapper/primary/WorkspaceRelStyleMapper.xml
@@ -17,3 +17,4 @@

 </mapper>

+