Merge branch 'master' of https://gitee.com/kutangguo/ktg-mes

ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java

@@ -35,6 +35,9 @@ public class MdWorkshop extends BaseEntity
     @Excel(name = "负责人")
     private String charge;
 
+    /** 负责人id */
+    private Long chargeId;
+
     /** 是否启用 */
     @Excel(name = "是否启用")
     private String enableFlag;
@@ -51,7 +54,15 @@ public class MdWorkshop extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
-    public void setWorkshopId(Long workshopId) 
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
+    public void setWorkshopId(Long workshopId)
     {
         this.workshopId = workshopId;
     }
@@ -150,6 +161,7 @@ public class MdWorkshop extends BaseEntity
             .append("workshopName", getWorkshopName())
             .append("area", getArea())
             .append("charge", getCharge())
+            .append("chargeId", getChargeId())
             .append("enableFlag", getEnableFlag())
             .append("remark", getRemark())
             .append("attr1", getAttr1())

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMdWorkshopVo">
-        select workshop_id, workshop_code, workshop_name, area, charge, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
+        select workshop_id, workshop_code, workshop_name, area, charge, charge_id, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
     </sql>
 
     <select id="selectMdWorkshopList" parameterType="MdWorkshop" resultMap="MdWorkshopResult">