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/VnoticeUser.java

@@ -78,10 +78,10 @@ public class VnoticeUser extends Model<VnoticeUser> {
     private LocalDateTime indate;
 
     /**
-     * 文件类型
+     * 文件类型0-模具文档，1-零件文档，2-试模验收 3-保养方案 4-模具更新 5-模具报废，2-试模验收 3-保养方案 4-模具更新 5-模具报废
      */
-    @TableField("blong_type")
-    private Integer blongType;
+    @TableField("belong_type")
+    private Integer belongType;
 
 
     public Integer getId() {
@@ -164,12 +164,12 @@ public class VnoticeUser extends Model<VnoticeUser> {
         this.indate = indate;
     }
 
-    public Integer getBlongType() {
-        return blongType;
+    public Integer getBelongType() {
+        return belongType;
     }
 
-    public void setBlongType(Integer blongType) {
-        this.blongType = blongType;
+    public void setBelongType(Integer belongType) {
+        this.belongType = belongType;
     }
 
     @Override
@@ -190,7 +190,7 @@ public class VnoticeUser extends Model<VnoticeUser> {
         ", refId=" + refId +
         ", content=" + content +
         ", indate=" + indate +
-        ", blongType=" + blongType +
+        ", belongType=" + belongType +
         "}";
     }
 }

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

@@ -14,7 +14,7 @@
         <result column="ref_id" property="refId" />
         <result column="content" property="content" />
         <result column="indate" property="indate" />
-        <result column="belong_type" property="blongType" />
+        <result column="belong_type" property="belongType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->