From 54c39cb2b8772230ec57aca6582a0ae9002720a4 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 9 Oct 2023 17:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E7=BB=B4=E6=8A=A4(=E5=B7=A5=E5=8E=82factory-?=
 =?UTF-8?q?>factoryCode)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/device/domain/EquCheckItem.java | 10 +++++-----
 .../resources/mapper/device/EquCheckItemMapper.xml   | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
index c2c5ac97d..90db3f227 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
@@ -47,7 +47,7 @@ public class EquCheckItem extends BaseEntity {
 
 	/** 工厂 */
 	@Excel(name = "工厂")
-	private String factory;
+	private String factoryCode;
 
 	/** 备用字段1 */
 	@Excel(name = "备用字段1")
@@ -198,12 +198,12 @@ public class EquCheckItem extends BaseEntity {
 	public String getItemRemark() {
 		return itemRemark;
 	}
-	public void setFactory(String factory) {
-		this.factory = factory;
+	public void setFactory(String factoryCode) {
+		this.factoryCode = factoryCode;
 	}
 
 	public String getFactory() {
-		return factory;
+		return factoryCode;
 	}
 	public void setAttr1(String attr1) {
 		this.attr1 = attr1;
@@ -272,7 +272,7 @@ public class EquCheckItem extends BaseEntity {
 			.append("itemType", getItemType())
 			.append("itemTypeName", getItemTypeName())
 			.append("itemRemark", getItemRemark())
-			.append("factory", getFactory())
+			.append("factoryCode", getFactory())
 			.append("attr1", getAttr1())
 			.append("attr2", getAttr2())
 			.append("attr3", getAttr3())
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
index d6f13f3b0..9f85e7ec4 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="itemType"	column="item_type"	/>
 		<result property="itemTypeName"	column="item_type_name"	/>
 		<result property="itemRemark"	column="item_remark"	/>
-		<result property="factory"	column="factory"	/>
+		<result property="factoryCode"	column="factoryCode"	/>
 		<result property="attr1"	column="attr1"	/>
 		<result property="attr2"	column="attr2"	/>
 		<result property="attr3"	column="attr3"	/>
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectEquCheckItemVo">
-		select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory, attr1, attr2, attr3, del_flag, created_time, created_by, updated_time, updated_by from equ_check_item
+		select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, created_time, created_by, updated_time, updated_by from equ_check_item
 	</sql>
 
 	<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="itemType != null  and itemType != ''"> and item_type = #{itemType}</if>
 			<if test="itemTypeName != null  and itemTypeName != ''"> and item_type_name like concat('%', #{itemTypeName}, '%')</if>
 			<if test="itemRemark != null  and itemRemark != ''"> and item_remark = #{itemRemark}</if>
-			<if test="factory != null  and factory != ''"> and factory = #{factory}</if>
+			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
 			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="itemType != null and itemType != ''">item_type,</if>
 			<if test="itemTypeName != null and itemTypeName != ''">item_type_name,</if>
 			<if test="itemRemark != null and itemRemark != ''">item_remark,</if>
-			<if test="factory != null">factory,</if>
+			<if test="factoryCode != null">factory_code,</if>
 			<if test="attr1 != null">attr1,</if>
 			<if test="attr2 != null">attr2,</if>
 			<if test="attr3 != null">attr3,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="itemType != null and itemType != ''">#{itemType},</if>
 			<if test="itemTypeName != null and itemTypeName != ''">#{itemTypeName},</if>
 			<if test="itemRemark != null and itemRemark != ''">#{itemRemark},</if>
-			<if test="factory != null">#{factory},</if>
+			<if test="factoryCode != null">#{factoryCode},</if>
 			<if test="attr1 != null">#{attr1},</if>
 			<if test="attr2 != null">#{attr2},</if>
 			<if test="attr3 != null">#{attr3},</if>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="itemType != null and itemType != ''">item_type = #{itemType},</if>
 			<if test="itemTypeName != null and itemTypeName != ''">item_type_name = #{itemTypeName},</if>
 			<if test="itemRemark != null and itemRemark != ''">item_remark = #{itemRemark},</if>
-			<if test="factory != null">factory = #{factory},</if>
+			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
 			<if test="attr1 != null">attr1 = #{attr1},</if>
 			<if test="attr2 != null">attr2 = #{attr2},</if>
 			<if test="attr3 != null">attr3 = #{attr3},</if>