Merge remote-tracking branch 'origin/master'

liusheng

7 天以前 42fb200e5c378ab7090e3aa4627faee8912eb67d

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

@@ -6,10 +6,9 @@
    druid:
      # 主库数据源
      master:
        #        义乌二院
        url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
        password: Smartor.2023

      # 从库数据源
      slave: