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/vo/PartVO.java

@@ -14,4 +14,5 @@ import lombok.Data;
 public class PartVO extends Part {
     private MouldFile part2dFile;
     private MouldFile part3dFile;
+    private Integer state;
 }

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

@@ -24,6 +24,7 @@
         <result column="creator_id" property="creatorId" />
         <result column="creator" property="creator" />
         <result column="mould_id" property="mouldId" />
+        <result column="state" property="state" />
         <association property="part2dFile" javaType="com.hssx.cloudmodel.entity.MouldFile" column="id" select="getPart2dFileByPartId">
         </association>
         <association property="part3dFile" javaType="com.hssx.cloudmodel.entity.MouldFile" column="id" select="getPart3dFileByPartId">
@@ -36,7 +37,7 @@
     </sql>
     <select id="selectPartFileByMouldId" resultMap="BaseResultMapVO">
         select
-          tbp.id, tbp.part_no, tbp.part_name, tbmf.indate, tbp.part_life, tbp.is_vulnerable, tbp.creator_id, tbp.creator, tbp.mould_id
+          tbp.id, tbp.part_no, tbp.part_name, tbmf.indate, tbp.part_life, tbp.is_vulnerable, tbp.creator_id, tbp.creator, tbp.mould_id,tbmf.state
         from
           tb_part tbp
         left join