Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>2.0.1.2023102701.Alpha</version>
+        <version>2.0.1.2023111401.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

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

@@ -67,6 +67,8 @@ public class ScreenDigitalFlopChart extends Chart {
         @ApiModelProperty(notes = "边框宽度")
         private Integer borderWidth;
 
+        @ApiModelProperty("字体")
+        private String fontFamily;
 
 
 

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

@@ -44,5 +44,8 @@ public class ScreenNumbersChart extends Chart {
         @ApiModelProperty(notes = "文字间距")
         private Integer letterSpacing;
 
+        @ApiModelProperty(notes = "千分位")
+        private Boolean thousands;
+
     }
 }

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>2.0.1.2023102701.Alpha</version>
+        <version>2.0.1.2023111401.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>

DataRoom/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>2.0.1.2023102701.Alpha</version>
+    <version>2.0.1.2023111401.Alpha</version>
 
     <packaging>pom</packaging>
     <name>dataroom</name>