From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index ff12653..cf97de9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -363,6 +363,13 @@
swiperPicture.setParams("");
}
+
+ String remark = swiperPicture.getRemark();
+ if (remark == null) {
+ swiperPicture.setRemark("");
+ }
+
+
JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
if (jumpDetail == null) {
// 榛樿鏈�夋嫨
--
Gitblit v1.8.0