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

src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml

@@ -190,7 +190,7 @@
 		blsd.BZ as TASK_TYPE_NUM,
 		bhd1.DICTIONARY_NAME as CHECK_CATEGORY_NAME,
 		bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME,
-		btl.DESCRIBE as BAO_BAO_NUM_NAME
+		btl.TERM_DESCRIBE as BAO_BAO_NUM_NAME
 		from
 		<include refid="tableName"></include> f
 		left join bus_hiddendangercheckstandard_custom bl on bl.CUSTOM_ID = f.CUSTOM_ID

src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.xml

@@ -15,7 +15,7 @@
 	<!-- 字段 -->
 	<sql id="Field">
 		f.TASK_NUM,
-		f.DESCRIBE,
+		f.TERM_DESCRIBE,
 		f.WORK_TYPE,
 		f.IS_DELETE,
 		f.CREATE_TIME,
@@ -26,7 +26,7 @@
 	<!-- 字段用于新增 -->
 	<sql id="Field2">
 		TASK_NUM,
-		DESCRIBE,
+		TERM_DESCRIBE,
 		WORK_TYPE,
 		IS_DELETE,
 		CREATE_TIME,
@@ -37,7 +37,7 @@
 	<!-- 字段值 -->
 	<sql id="FieldValue">
 		#{TASK_NUM},
-		#{DESCRIBE},
+		#{TERM_DESCRIBE},
 		#{WORK_TYPE},
 		#{IS_DELETE},
 		#{CREATE_TIME},
@@ -72,7 +72,7 @@
 		<include refid="tableName"></include>
 		set
 			TASK_NUM = #{TASK_NUM},
-			DESCRIBE = #{DESCRIBE},
+			TERM_DESCRIBE = #{TERM_DESCRIBE},
 			WORK_TYPE = #{WORK_TYPE},
 			IS_DELETE = #{IS_DELETE},
 			CREATE_TIME = #{CREATE_TIME},