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/controller/client/v2/DynamicControllerV2.java | 2 ++
1 files changed, 2 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 3d456e3..78b09a1 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,6 +1251,7 @@
if (!StringUtil.isNullOrEmpty(special.getPicture())) {
imgs.add(special.getPicture());
}
+ title=special.getName();
desc = special.getRemark();
startTime = special.getStartTime();
endTime = special.getEndTime();
@@ -1265,6 +1266,7 @@
if (!StringUtil.isNullOrEmpty(swiper.getSrc())) {
imgs.add(swiper.getSrc());
}
+ title=swiper.getTitle();
desc = swiper.getRemark();
startTime = swiper.getStartTime();
endTime = swiper.getEndTime();
--
Gitblit v1.8.0