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

@@ -338,7 +338,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             msg.setError("当前用户不存在或者不存在");
             return msg;
         }else{
-            Integer ownerCompany = projectMapper.selectById(userVO.getId()).getOwnerCompany();
+            Integer ownerCompany = projectMapper.selectById(userVO.getProjectId()).getOwnerCompany();
             List<Integer> companyIds = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>()
                     .eq("project_id", userVO.getProjectId()))
                     .stream()