Merge branch 'master' of http://192.168.111.222:3000/lzz/klck

# Conflicts:
#	ruoyi-ui/src/views/system/supplies/index.vue

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

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

ruoyi-ui/public/index.html

@@ -216,7 +216,7 @@
 <style>
   .el-dialog__header{
     padding:20px 20px 10px;
-    background-color: #b8d1fb;
+    background-color: dodgerblue;
   }
   .el-dialog__headerbtn .el-dialog__close {
     color: #f5f8ff;