Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/dataease/base/domain/ChartView.java

 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChartView implements Serializable {
+    @ApiModelProperty("ID")
     private String id;
-
+    @ApiModelProperty("名称")
     private String name;
-
+    @ApiModelProperty("分组ID")
     private String sceneId;
-
+    @ApiModelProperty("数据集ID")
     private String tableId;
-
+    @ApiModelProperty("图表类型")
     private String type;
-
+    @ApiModelProperty("标题")
     private String title;
-
+    @ApiModelProperty("创建人")
     private String createBy;
-
+    @ApiModelProperty("创建时间")
     private Long createTime;
-
+    @ApiModelProperty("更新时间")
     private Long updateTime;
-
+    @ApiModelProperty("样式优先级")
     private String stylePriority;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

@@ -46,7 +46,7 @@ public class ChartViewController {
         return chartViewService.listAndGroup(chartViewRequest);
     }
 
-    @ApiOperation("详息")
+    @ApiOperation("详细信息")
     @PostMapping("/get/{id}")
     public ChartViewWithBLOBs get(@PathVariable String id) {
         return chartViewService.get(id);

backend/src/main/java/io/dataease/controller/request/chart/ChartViewRequest.java

 package io.dataease.controller.request.chart;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +12,8 @@ import lombok.Setter;
 @Setter
 @Getter
 public class ChartViewRequest extends ChartViewWithBLOBs {
+    @ApiModelProperty("排序")
     private String sort;
-
+    @ApiModelProperty("当前登陆用户ID")
     private String userId;
 }