解决新模块部分不兼容问题

klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java

@@ -22,16 +22,6 @@ public class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /** 备注 */
-    private String remark;
     /**
      * 搜索值
      */

klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckMachinery.java

@@ -54,6 +54,18 @@ public class DvCheckMachinery extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+
     public void setRecordId(Long recordId)
     {
         this.recordId = recordId;

klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckRecord.java

@@ -83,6 +83,16 @@ public class DvCheckRecord extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvCheckSubject.java

@@ -57,6 +57,16 @@ public class DvCheckSubject extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvMachinery.java

@@ -84,6 +84,16 @@ public class DvMachinery extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setMachineryId(Long machineryId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvMaintenRecord.java

@@ -89,6 +89,16 @@ public class DvMaintenRecord extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRecordId(Long recordId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepair.java

@@ -109,6 +109,16 @@ public class DvRepair extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setRepairId(Long repairId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvRepairLine.java

@@ -69,6 +69,16 @@ public class DvRepairLine extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setLineId(Long lineId)
     {

klp-mes/src/main/java/com/klp/mes/dv/domain/DvSubject.java

@@ -53,6 +53,16 @@ public class DvSubject extends BaseEntity
 
     /** 预留字段4 */
     private Long attr4;
+    /** 备注 */
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public void setSubjectId(Long subjectId)
     {

klp-wms/src/main/java/com/klp/domain/WmsProduct.java

@@ -78,5 +78,9 @@ public class WmsProduct extends BaseEntity {
      */
     @TableLogic
     private Integer delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
 
 }

klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java

@@ -94,6 +94,6 @@ public class WmsProductBo extends BaseEntity {
      * 是否启用（0=否，1=是）
      */
     private Integer isEnabled;
-
+    //备注
-
+    private String remark;
 }

klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java

@@ -101,6 +101,11 @@ public class WmsProductVo {
     @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0==否，1=是")
     private Integer isEnabled;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
 
 
 }

klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="unit" column="unit"/>
+        <result property="remark" column="remark"/>
     </resultMap>