Merge remote-tracking branch 'origin/master'

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;
+
+
+
 
     }
 

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;