Merge branch 'feature/社群' into 'developer'

结束日期

See merge request !646

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -123,8 +123,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             entity.setSendTime(new Date());
         }
         entity.setStartTime(entity.getSendTime());
-        Date date = DateUtil.addDay(new Date(), entity.getExpireDays());
-        entity.setEndTime(DateUtil.getEndTimeOfDay(date));
+        Date endTime = DateUtil.addDay(entity.getStartTime(), entity.getExpireDays());
+        entity.setEndTime(DateUtil.getEndTimeOfDay(endTime));
         String staffIdList = dto.getStaffIdList();
         if (null == planId) {
             planId = UniqueIdUtils.uniqueLong();