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

@@ -87,7 +87,7 @@ public class CompanyController {
      * 参数：companyType 公司类型 0-资产方 1-生产方
      * @return
      */
-    @ApiOperation("公司列表")
+    @ApiOperation("建立关联公司时的公司列表")
     @RequestMapping("/relationList")
     @ResponseBody
     public HttpRespMsg relationList(@RequestParam(required = false)Integer companyType) {