diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java index 25f5c5cb..58b259e6 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java @@ -61,6 +61,14 @@ public class ScreenDigitalFlopChart extends Chart { @ApiModelProperty(notes = "高度") private Integer height; + @ApiModelProperty(notes = "边框颜色") + private String borderColor; + + @ApiModelProperty(notes = "边框宽度") + private Integer borderWidth; + + + } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenPictureChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenPictureChart.java index 718068a5..07fa2a94 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenPictureChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenPictureChart.java @@ -19,7 +19,7 @@ public class ScreenPictureChart extends Chart { @Data public static class Customize { @ApiModelProperty(notes = "透明度") - private Integer opacity; + private Float opacity; @ApiModelProperty(notes = "圆角") private Integer radius;