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

@@ -85,6 +85,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             if (count > 0) {
                 msg.setError("当前模具编号已存在，请重新输入其他模具编号");
             } else {
+                if (mould.getProduceCompanyId() != null) {
+                    Company company = companyMapper.selectById(mould.getProduceCompanyId());
+                    mould.setArea(company.getCompanyAddress());
+                }
                 mould.setCreatorId(user.getId());
                 mould.setCompanyId(user.getCompanyId());
                 mouldMapper.insert(mould);