Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMarqueeChart.java

@@ -19,6 +19,9 @@ public class ScreenMarqueeChart extends Chart{
     @ApiModelProperty(notes = "类型")
     private String type = PageDesignConstant.BigScreen.Type.MARQUEE;
 
+    @ApiModelProperty(notes = "自定义处理数据源脚本")
+    private String dataHandler;
+
     @ApiModelProperty(notes = "个性化")
     private Customize customize = new Customize();
 
@@ -73,7 +76,8 @@ public class ScreenMarqueeChart extends Chart{
         @ApiModelProperty(notes = "背景色渐变方向")
         private String bgGradientDirection;
 
-
+        @ApiModelProperty(notes = "语音播报")
+        private Boolean voiceBroadcast;
     }
 
 }