细节优化

op-modules/op-technology/src/main/java/com/op/technology/domain/Equipment.java

@@ -101,13 +101,13 @@ public class Equipment extends BaseEntity {
      * 预留字段3
      */
     @Excel(name = "预留字段3")
-    private Long attr3;
+    private String attr3;
 
     /**
      * 预留字段4
      */
     @Excel(name = "预留字段4")
-    private Long attr4;
+    private String attr4;
 
     /** 单台能力工时 */
 //	@Excel(name = "单台能力工时")
@@ -135,6 +135,22 @@ public class Equipment extends BaseEntity {
     private String itemCode;
     private String itemName;
 
+    public String getAttr4() {
+        return attr4;
+    }
+
+    public String getAttr3() {
+        return attr3;
+    }
+
+    public void setAttr3(String attr3) {
+        this.attr3 = attr3;
+    }
+
+    public void setAttr4(String attr4) {
+        this.attr4 = attr4;
+    }
+
     public void setItemCode(String itemCode) {
         this.itemCode = itemCode;
     }
@@ -263,21 +279,6 @@ public class Equipment extends BaseEntity {
         return attr2;
     }
 
-    public void setAttr3(Long attr3) {
-        this.attr3 = attr3;
-    }
-
-    public Long getAttr3() {
-        return attr3;
-    }
-
-    public void setAttr4(Long attr4) {
-        this.attr4 = attr4;
-    }
-
-    public Long getAttr4() {
-        return attr4;
-    }
 
     //	public void setUnitWorkingHours(String unitWorkingHours) {
 //		this.unitWorkingHours = unitWorkingHours;

op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml

@@ -120,7 +120,10 @@
 	</sql>
 
     <sql id="selectEquipmentVo">
-		select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price from base_equipment
+		select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id,
+		       equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status,
+		       remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time,
+		       workshop_section, equipment_location, hourly_unit_price from base_equipment
 	</sql>
 
     <sql id="selectProProcessVo">