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

@@ -174,8 +174,8 @@ public class CompanyController {
      * 参数 token 身份凭证  projectId 项目id
      * @return
      */
-    @ApiOperation(value = "返回当前公司的关联公司列表")
-    @RequestMapping("/ownerRelateCompany")
+    @ApiOperation(value = "根据项目id获取项目的生产方公司")
+    @RequestMapping("/getProduceCompany")
     @ResponseBody
     public HttpRespMsg getProduceCompany(UserVO userVO){
         HttpRespMsg msg = new HttpRespMsg();