Merge branch 'master' of 115.28.80.125:templates/springmvcprojecttemplate

web/src/main/resources/mybatis/mysqlGeneratorConfig.xml

@@ -47,6 +47,7 @@
         <table tableName="%">
             <property name="useActualColumnNames"
                       value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
     </context>
 </generatorConfiguration>

web/src/main/resources/mybatis/oracleGeneratorConfig.xml

@@ -14,8 +14,8 @@
 
         <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
                         connectionURL="jdbc:oracle:thin:@haomo-studio.com:21521:xe"
-                        userId="STEAM_MONITOR"
-                        password="STEAM_MONITOR"/>
+                        userId="HM_ORGANIZATION"
+                        password="123456"/>
 
         <!-- 指定生成的类型为java类型，避免数据库中number等类型字段 -->
         <javaTypeResolver>
@@ -45,8 +45,12 @@
                       value="false"/>
         </javaClientGenerator>
 
-        <table schema="STEAM_MONITOR" tableName="%">
+        <table schema="HM_ORGANIZATION" tableName="%">
             <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
+        <!--<table  tableName="%">-->
+            <!--<property name="useActualColumnNames" value="false"/>-->
+        <!--</table>-->
     </context>
 </generatorConfiguration>