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 |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 1 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 844023e..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
@@ -1,12 +1,59 @@
 package com.yeshi.fanli.vo.msg;
 
-public class ClientTextStyleVO {
+import java.io.Serializable;
+
+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";
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Expose
 	private String content;
+	@Expose
 	private String color;
+	@Expose
+	private String bottomColor;
+	@Expose
+	private String img;
+	@Expose
+	private String fontSize = "1"; // 瀛椾綋鍊嶆暟
+
 
 	public ClientTextStyleVO(String content, String color) {
 		this.content = content;
 		this.color = color;
+	}
+
+	public ClientTextStyleVO(String content, String color, String img) {
+		this.content = content;
+		this.color = color;
+		this.img = img;
+	}
+
+	public ClientTextStyleVO(String content, String color, String bottomColor, String img) {
+		this.content = content;
+		this.color = color;
+		this.bottomColor = bottomColor;
+		this.img = img;
+	}
+
+	public ClientTextStyleVO(String img) {
+		this.img = img;
+	}
+
+	public String getImg() {
+		return img;
+	}
+
+	public void setImg(String img) {
+		this.img = img;
 	}
 
 	public ClientTextStyleVO() {
@@ -27,4 +74,20 @@
 	public void setColor(String color) {
 		this.color = color;
 	}
+
+	public String getBottomColor() {
+		return bottomColor;
+	}
+
+	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