Merge branch 'dev/dev_xp' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

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

@@ -126,5 +126,11 @@ public class AffiliateController {
         return Response.success(affiliateService.getAllAffiliateUsername());
     }
 
+    @ApiOperation(value = "修改affiliate状态，Active | Inactive | Delete")
+    @GetMapping("/modifyAffiliateStatus")
+    public Response<String> modifyAffiliateStatus(@RequestParam Long affiliateId, @RequestParam String operationType) {
+        affiliateService.modifyAffiliateStatus(affiliateId, operationType);
+        return Response.success();
+    }
 
 }

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

@@ -243,4 +243,10 @@ public class LibraryController {
         return Response.success(libraryService.getAllSubAccLib(order, page, size));
     }
 
+    @ApiOperation(value = "将系统sketch添加到library")
+    @GetMapping("addSysSketchToLibrary")
+    public Response<String> addSysSketchToLibrary(Long clothId, String path) {
+        return Response.success(libraryService.addSysSketchToLibrary(clothId, path));
+    }
+
 }