Merge remote-tracking branch 'origin/develop_master' into develop_master

# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
This commit is contained in:
duanwenbin
2021-07-07 11:23:08 +08:00
10 changed files with 70 additions and 26 deletions
@@ -35,7 +35,7 @@
</update>
<select id="existTable" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(*) from information_schema.tables where table_name = #{tableName}
select count(*) from information_schema.TABLES where table_name = #{tableName}
</select>
<!-- 查询条件 -->