Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Mould.java

@@ -118,16 +118,10 @@ public class Mould extends Model<Mould> {
     private String area;
 
     /**
-     * 工厂id
+     * 生产方公司名称
      */
-    @TableField("factory_id")
-    private Integer factoryId;
-
-    /**
-     * 工厂名称
-     */
-    @TableField("factory_name")
-    private String factoryName;
+    @TableField("project_company_name")
+    private String produceCompanyName;
 
     /**
      * 初始模次(保养设定次数)
@@ -298,21 +292,6 @@ public class Mould extends Model<Mould> {
         this.area = area;
     }
 
-    public Integer getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(Integer factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public String getFactoryName() {
-        return factoryName;
-    }
-
-    public void setFactoryName(String factoryName) {
-        this.factoryName = factoryName;
-    }
 
     public Integer getInitialModulus() {
         return initialModulus;
@@ -375,6 +354,18 @@ public class Mould extends Model<Mould> {
         return this.id;
     }
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getProduceCompanyName() {
+        return produceCompanyName;
+    }
+
+    public void setProduceCompanyName(String produceCompanyName) {
+        this.produceCompanyName = produceCompanyName;
+    }
+
     @Override
     public String toString() {
         return "Mould{" +
@@ -394,8 +385,6 @@ public class Mould extends Model<Mould> {
         ", rfid=" + rfid +
         ", settingLife=" + settingLife +
         ", area=" + area +
-        ", factoryId=" + factoryId +
-        ", factoryName=" + factoryName +
         ", initialModulus=" + initialModulus +
         ", equipmentId=" + equipmentId +
         ", belongProjectGrade=" + belongProjectGrade +

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -20,12 +20,11 @@
         <result column="rfid" property="rfid" />
         <result column="setting_life" property="settingLife" />
         <result column="area" property="area" />
-        <result column="factory_id" property="factoryId" />
-        <result column="factory_name" property="factoryName" />
         <result column="initial_modulus" property="initialModulus" />
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
+        <result column="produce_company_name" property="produceCompanyName" />
         <result column="run_times" property="runTimes" />
         <result column="is_maintain" property="isMaintain" />
         <result column="maintain_count" property="maintainCount" />
@@ -54,8 +53,7 @@
         <result column="rfid" property="rfid"/>
         <result column="setting_life" property="settingLife"/>
         <result column="area" property="area"/>
-        <result column="factory_id" property="factoryId"/>
-        <result column="factory_name" property="factoryName"/>
+        <result column="produce_company_name" property="produceCompanyName"/>
         <result column="initial_modulus" property="initialModulus"/>
         <result column="equipment_id" property="equipmentId"/>
         <result column="belong_project_grade" property="belongProjectGrade"/>