Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -199,4 +199,11 @@ public class ConvenientInquiryController {
     public Response<PageBaseResponse<AccountCreditsUsageDTO>> getGenerateFrequency(@Valid @RequestBody AccountCreditsUsageQueryDTO queryDTO){
        return Response.success(convenientInquiryService.getGenerateFrequency(queryDTO));
     }
+
+    @ApiOperation("获取所有生成功能的名字")
+    @GetMapping("/getAllGenerateFuncName")
+    public Response<List<String>> getAllGenerateFuncName(){
+        return Response.success(convenientInquiryService.getAllGenerateFuncName());
+    }
+
 }

src/main/java/com/ai/da/controller/ElementController.java

@@ -112,12 +112,12 @@ public class ElementController {
     @ApiOperation(value = "图片分割")
     @PostMapping("/imageSegmentation")
     public Response<List<CollectionElementVO>> selectedImageSeg(
-            @RequestPart(value = "files", required = false) MultipartFile[] files,
+            @RequestPart(value = "file", required = false) MultipartFile[] file,
             @RequestParam(value = "type", required = false) @Pattern(regexp = "sketch|product", message = "类型必须是sketch或product") String type,
             @RequestParam(value = "id", required = false) Long id) {
         // 过滤空文件
-        List<MultipartFile> nonEmptyFiles = Arrays.stream(files)
-                .filter(file -> !file.isEmpty())
+        List<MultipartFile> nonEmptyFiles = Arrays.stream(file)
+                .filter(item -> !item.isEmpty())
                 .collect(Collectors.toList());
         // 参数校验
         if ((nonEmptyFiles.isEmpty()) && id == null) {