Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/service/GenerateService.java

src/main/java/com/ai/da/model/vo/MagicToolResultVO.java

@@ -0,0 +1,25 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel("generate result 响应")
+@AllArgsConstructor
+@NoArgsConstructor
+public class MagicToolResultVO {
+
+    private String taskId;
+
+    private Long id;
+
+    private String url;
+
+    private String status;
+
+    private String category;
+
+    private String sourceUrl;
+}

src/main/java/com/ai/da/model/vo/WorkspaceVO.java

@@ -24,7 +24,7 @@ public class WorkspaceVO extends Workspace {
 
     private static final long serialVersionUID = 1L;
 
-    private Long currentId;
+    private Long styleId;
 
     private PageBaseResponse<WorkspaceVO> page;