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/service/impl/MouldFileServiceImpl.java

@@ -176,9 +176,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                                 content = "试模验收文档";
                             } else if (blongType == 3) {
                                 content = "保养方案文档";
-                            } else if (blongType == 4) {
-                                content = "模具更新文档";
-                            } else if (blongType == 5) {
+                            }else if (blongType == 5) {
                                 content = "模具报废文档";
                             }
                             newsNotice.setContent("有新的" + content + ",待您审批。");
@@ -191,6 +189,8 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }
                 }
                 msg.data = projectFile;
+            }else{
+
             }
         } else {
             msg.setError("当前用户不存在或者未登录");

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

@@ -59,7 +59,7 @@
     </select>
     <select id="getList" resultMap="BaseResultMapVO">
         select
-          tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent
+          tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent,
           tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
           tbme.is_use, tbme.hill_number,tbc.company_name companyName,tbm.model_no modelNo,tbm.model_name modelName
         from