提交 009aebde authored 作者: wangjiahao's avatar wangjiahao

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

package io.dataease.base.domain; package io.dataease.base.domain;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class ChartView implements Serializable { public class ChartView implements Serializable {
@ApiModelProperty("ID")
private String id; private String id;
@ApiModelProperty("名称")
private String name; private String name;
@ApiModelProperty("分组ID")
private String sceneId; private String sceneId;
@ApiModelProperty("数据集ID")
private String tableId; private String tableId;
@ApiModelProperty("图表类型")
private String type; private String type;
@ApiModelProperty("标题")
private String title; private String title;
@ApiModelProperty("创建人")
private String createBy; private String createBy;
@ApiModelProperty("创建时间")
private Long createTime; private Long createTime;
@ApiModelProperty("更新时间")
private Long updateTime; private Long updateTime;
@ApiModelProperty("样式优先级")
private String stylePriority; private String stylePriority;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -46,7 +46,7 @@ public class ChartViewController { ...@@ -46,7 +46,7 @@ public class ChartViewController {
return chartViewService.listAndGroup(chartViewRequest); return chartViewService.listAndGroup(chartViewRequest);
} }
@ApiOperation("详息") @ApiOperation("详细信息")
@PostMapping("/get/{id}") @PostMapping("/get/{id}")
public ChartViewWithBLOBs get(@PathVariable String id) { public ChartViewWithBLOBs get(@PathVariable String id) {
return chartViewService.get(id); return chartViewService.get(id);
......
package io.dataease.controller.request.chart; package io.dataease.controller.request.chart;
import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.base.domain.ChartViewWithBLOBs;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -11,7 +12,8 @@ import lombok.Setter; ...@@ -11,7 +12,8 @@ import lombok.Setter;
@Setter @Setter
@Getter @Getter
public class ChartViewRequest extends ChartViewWithBLOBs { public class ChartViewRequest extends ChartViewWithBLOBs {
@ApiModelProperty("排序")
private String sort; private String sort;
@ApiModelProperty("当前登陆用户ID")
private String userId; private String userId;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论