From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 7e0e97c..f5ce570 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -1251,7 +1251,9 @@
if (!StringUtil.isNullOrEmpty(special.getPicture())) {
imgs.add(special.getPicture());
}
+
title = special.getName();
+
desc = special.getRemark();
startTime = special.getStartTime();
endTime = special.getEndTime();
@@ -1266,6 +1268,7 @@
if (!StringUtil.isNullOrEmpty(swiper.getSrc())) {
imgs.add(swiper.getSrc());
}
+
title = swiper.getTitle();
desc = swiper.getDesc();
startTime = swiper.getStartTime();
--
Gitblit v1.8.0