Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

fei

2025-09-21 47869ed41d8a0d329f770f1654b3794ba601d098

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@
            master:
                url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: 123456
                password: ZhangApp123!
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭