From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
index ed33b69..3bc0f54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
@@ -5,6 +5,11 @@
import com.google.gson.annotations.Expose;
public class ClientTextStyleVO implements Serializable{
+
+ public final static String COLOR_TITLE = "#888888";
+ public final static String COLOR_CONTENT = "#000000";
+ public final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";
+
/**
*
*/
@@ -17,6 +22,9 @@
private String bottomColor;
@Expose
private String img;
+ @Expose
+ private String fontSize = "1"; // 瀛椾綋鍊嶆暟
+
public ClientTextStyleVO(String content, String color) {
this.content = content;
@@ -74,4 +82,12 @@
public void setBottomColor(String bottomColor) {
this.bottomColor = bottomColor;
}
+
+ public String getFontSize() {
+ return fontSize;
+ }
+
+ public void setFontSize(String fontSize) {
+ this.fontSize = fontSize;
+ }
}
--
Gitblit v1.8.0