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

@@ -53,7 +53,7 @@ public class MouldFileController {
      * 模具文档的上传
      * 参数: token 用户身份凭证，
      * mouldId 模具id ,
-     * blongType 文档类型（0-模具文档 1-零件文档 2-试模验收 3-保养方案 4-模具更新 5-模具报废），
+     * belongType 文档类型（0-模具文档 1-零件文档 2-试模验收 3-保养方案 4-模具更新 5-模具报废），
      * 注：blongType 为 1 时需要多传  partId 零件id
      * blongType  为3 以下的file和dwgType参数均不需要传递
      * file 文件信息，dwgType 图档类型0-2D,1-3D(上传零件文档和模具文档时传该参数)
@@ -63,15 +63,15 @@ public class MouldFileController {
     @ApiOperation("模具文档的上传")
     @RequestMapping("/uploadFile")
     @ResponseBody
-    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file, @RequestParam(required = false) MultipartFile file2, @RequestParam(required = false) Integer blongType,
+    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file, @RequestParam(required = false) MultipartFile file2, @RequestParam(required = false) Integer belongType,
                                   HttpServletResponse response, HttpServletRequest request, UserVO userVO) throws Exception {
 //      System.out.println("开始上传文件" + "file+" + file.getOriginalFilename());
-        System.out.println("blongType" + blongType);
-        if (null == blongType) {
-            blongType = 0;
+        System.out.println("belongType" + belongType);
+        if (null == belongType) {
+            belongType = 0;
         }
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldFileService.addFile(userVO, blongType, file, file2, path);
+        msg = mouldFileService.addFile(userVO, belongType, file, file2, path);
         return msg;
     }