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

@@ -70,8 +70,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     mould.setArea(company.getCompanyAddress());
                 }
                 mouldMapper.updateById(mould);
+                msg.data = mould;
             } else {
                 msg.setError("当前模具编号已存在，请重新输入其他模具编号");
+                return msg;
             }
         } else {
             if (null != mould.getPreUpdateId()) {
@@ -98,6 +100,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     mould.setProduceCompanyId(model.getProduceCompanyId());
                     mould.setArea(model.getArea());
                     mouldMapper.insert(mould);
+                    msg.data = mould;
                     //将之前的模具与项目和设备解绑
                     model.setProjectId(null);
                     model.setEquipmentId(null);
@@ -118,6 +121,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     mould.setCreatorId(user.getId());
                     mould.setCompanyId(user.getCompanyId());
                     mouldMapper.insert(mould);
+                    msg.data = mould;
                 }
             }
         }