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/controller/MouldOperationDynamicsController.java

@@ -47,7 +47,7 @@ public class MouldOperationDynamicsController {
         }else{
             list.add(mouldOperationDynamics.getMouldId());
         }
-        msg.data = mDynamicsService.getlist(list,mouldOperationDynamics);
+        msg = mDynamicsService.getlist(list,mouldOperationDynamics);
         return msg;
     }
 

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

@@ -103,6 +103,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         if (user.getSubordinateType() == 0) {
                             //上传人为资产方审批人,自动审核通过
                             projectFile.setState(1);
+
                         } else if (user.getSubordinateType() == 1) {
                             //上传人为生产方，自动审核通过
                             projectFile.setState(2);