Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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();