Resolve conflicts in application-dev.yml

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

@@ -16,9 +16,9 @@ spring:
         master:
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/aihumanv2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: aihumanv2
+          username: root
-          password: 123456
+          password: root
 
       hikari:
         # 最大连接池数量

ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml

@@ -1,10 +0,0 @@
-# 代码生成
-gen:
-  # 作者
-  author: ageerle
-  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: org.ruoyi.aihuman
-  # 自动去除表前缀，默认是false
-  autoRemovePre: false
-  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: aihuman_