Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang i...

xuhy

2025-04-27 2607650225e782edf5ea21dcfdf3b7d6f28ea584

Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev

# Conflicts:
#	ruoyi-applet/src/main/resources/application-prod.yml

 ruoyi-applet/src/main/resources/application-prod.yml

@@ -221,7 +221,7 @@
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucket: xzgt-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgt-1305134071.cos.ap-chengdu.myqcloud.com
    location: /xizang