Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -791,4 +791,10 @@ public class AMScontroller  extends BaseRESTfulController {
     public RESTfulResult getMoney(@PathVariable String id) {
         return amsFeign.getprintstr(id);
     }
+
+    @ApiOperation("上传凭证")
+    @PostMapping("/transPlanupload")
+    Map<String,Object> transPlanupload(@RequestBody Map<String,Object> map) {
+        return amsFeign.transPlanupload(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/SystemFileController.java

@@ -112,7 +112,7 @@ public class SystemFileController extends BaseRESTfulController {
     }
 
     @PostMapping("/insertFiles2")
-    public RESTfulResult insertFiles2(String fileuuid, @ModelAttribute MultipartFile[] file) {
+    public RESTfulResult insertFiles2(@RequestParam String fileuuid, @ModelAttribute MultipartFile[] file) {
         String filenames = "";
         for (int i = 0; i < file.length; i++) {
             filenames += file[i].getOriginalFilename() + ";";

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -287,4 +287,7 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements//getMoney/{id}")
     RESTfulResult getprintstr(@PathVariable String id);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/transPlanupload")
+    Map<String, Object> transPlanupload(@RequestBody(required = false) Map<String, Object> map);
+
 }