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

@@ -83,7 +83,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             if (null != mould.getPreUpdateId()) {
                 //更新模具操作
                 //取出之前模具的信息
-                Mould mould1 = mouldMapper.selectById(mould.getPreUpdateId());
+                Mould model = mouldMapper.selectById(mould.getPreUpdateId());
                 //查询当前模具编号的模具是否存在
                 Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
                 if (count > 0) {
@@ -96,6 +96,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     }
                     mould.setCreatorId(user.getId());
                     mould.setCompanyId(user.getCompanyId());
+                    mould.setEquipmentId(model.getEquipmentId());
+                    mould.setProjectId(model.getProjectId());
                     mouldMapper.insert(mould);
                 }
                 }else{