From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 3bc0f54..921d46a 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
@@ -17,11 +17,13 @@
@Expose
private String content;
@Expose
- private String color;
+ private String color; // 瀛楅鑹�
@Expose
- private String bottomColor;
+ private String bottomColor; // 鑳屾櫙棰滆壊
@Expose
- private String img;
+ private String borderColor; // 杈规棰滆壊
+ @Expose
+ private String img; // 鍥剧墖
@Expose
private String fontSize = "1"; // 瀛椾綋鍊嶆暟
@@ -90,4 +92,13 @@
public void setFontSize(String fontSize) {
this.fontSize = fontSize;
}
+
+ public String getBorderColor() {
+ return borderColor;
+ }
+
+ public void setBorderColor(String borderColor) {
+ this.borderColor = borderColor;
+ }
+
}
--
Gitblit v1.8.0