Merge remote-tracking branch 'origin/master'

liusheng

7 天以前 6381bb6b6422c23ee4801895019f1a432903fbe8

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

@@ -6,7 +6,7 @@
    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