Merge branch 'bgy' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-admin/src/main/resources/generator/config.properties

@@ -1,12 +0,0 @@
-jdbc.driverClass=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://158.58.50.21:3306/mediation_system?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true
-jdbc.user=root
-jdbc.password=YMzc157#
-#模块名称
-
-moduleName=diagnosis
-#表名
-tableName=subhealth_model_upgrade
-
-#主键
-premaryId=id

ruoyi-admin/src/main/resources/generator/generatorConfig.xml

@@ -1,38 +0,0 @@
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-
-<generatorConfiguration>
-    <properties resource="generator/config.properties"/>
-
-    <context id="Mysql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
-        <property name="beginningDelimiter" value="`"/>
-        <property name="endingDelimiter" value="`"/>
-
-        <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
-            <property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
-            <property name="caseSensitive" value="true"/>
-            <property name="lombok" value="Getter,Setter,ToString"/>
-        </plugin>
-
-        <jdbcConnection driverClass="${jdbc.driverClass}"
-                        connectionURL="${jdbc.url}"
-                        userId="${jdbc.user}"
-                        password="${jdbc.password}">
-        </jdbcConnection>
-        <!--实体-->
-        <javaModelGenerator targetPackage="com.ruoyi.wisdomarbitrate.domain.${moduleName}"
-                            targetProject="src/main/java"/>
-        <!--mapper.xml-->
-        <sqlMapGenerator targetPackage="mapper.**.${moduleName}"
-                         targetProject="src/main/resources"/>
-        <!--mapper接口-->
-        <javaClientGenerator targetPackage="com.ruoyi.**.mapper.${moduleName}"
-                             targetProject="src/main/java"
-                             type="XMLMAPPER"/>
-        <!--需要生成的数据库表-->
-        <table tableName="${tableName}">
-            <generatedKey column="${premaryId}" sqlStatement="JDBC"/>
-        </table>
-    </context>
-</generatorConfiguration>