Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java

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

@@ -44,8 +44,8 @@ public class WorkspaceController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "详情", notes = "传入workspace")
-    public Response<Workspace> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
-        Workspace detail = workspaceService.getByIdNew(id);
+    public Response<WorkspaceVO> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+        WorkspaceVO detail = workspaceService.getByIdNew(id);
         return Response.success(detail);
     }