Merge remote-tracking branch 'origin/master'

science-admin/src/main/resources/application.yml

@@ -161,7 +161,7 @@ spring:
   profiles: prod
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://nmg-kysb.mysql.rds.aliyuncs.com/nm_srp_system?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://nmg-kysb.mysql.rds.aliyuncs.com/yn_srp_system?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: yhbj_yn
     password: 'WpKJS2ZEx&35DrU'
   redis:
@@ -172,7 +172,7 @@ spring:
     # 服务器端口
     port: 6379
     # 数据库
-    database: 4
+    database: 7
     # 密码
     password: yhbj_yn:WpKJS2ZEx&35DrU
     lettuce: