From b8ff528a1af16727e245eee1274e29bcc3f66753 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Tue, 10 Oct 2023 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.1.2023101001.Alpha=EF=BC=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataRoom/dataroom-core/pom.xml                                | 2 +-
 .../core/module/chart/components/ScreenTextChart.java         | 3 +++
 DataRoom/dataroom-server/pom.xml                              | 2 +-
 DataRoom/pom.xml                                              | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index ab81adf3..2883c1ed 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023100901.Alpha</version>
+        <version>1.0.1.2023101001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTextChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTextChart.java
index 42ac59ed..0319498c 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTextChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTextChart.java
@@ -28,6 +28,9 @@ public class ScreenTextChart extends Chart {
         @ApiModelProperty(notes = "字体粗细")
         private Integer fontWeight;
 
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
         @ApiModelProperty(notes = "字体颜色")
         private String color;
 
diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml
index ea54e4d7..49ffd7c7 100644
--- a/DataRoom/dataroom-server/pom.xml
+++ b/DataRoom/dataroom-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023100901.Alpha</version>
+        <version>1.0.1.2023101001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index c8952996..c4ec9695 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>1.0.1.2023100901.Alpha</version>
+    <version>1.0.1.2023101001.Alpha</version>
 
     <packaging>pom</packaging>
     <name>dataroom</name>
@@ -44,7 +44,7 @@
         <swagger-models.version>1.5.21</swagger-models.version>
         <jackson.version.core>2.13.3</jackson.version.core>
         <json.version>20220320</json.version>
-        <dataset.core.version>1.0.1.2023100901.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023101001.Alpha</dataset.core.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>