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

@@ -139,5 +139,18 @@ public class CompanyController {
         msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
         return msg;
     }
+//    /**
+//     * 公司详情
+//     * 参数 token 用户身份凭证
+//     * @return
+//     */
+//    @ApiOperation(value = "生产方公司和公司下所属的模具")
+//    @RequestMapping("/getCoutomCompanyAndMouldsByUser")
+//    @ResponseBody
+//    public HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO){
+//        HttpRespMsg msg = new HttpRespMsg();
+//        msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
+//        return msg;
+//    }
 }