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"
-
+
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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