Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!516

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -118,7 +118,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         }
 
         Date now = DateUtils.getNowDate();
-        if (MarketingStatusEnum.CLOSE.getValue().equals(marketing.getIsOn()) || now.after(marketing.getStartTime())) {
+        if (MarketingStatusEnum.CLOSE.getValue().equals(marketing.getIsOn()) || now.after(marketing.getEndTime())) {
             throw new ServiceException("活动当前状态不支持修改");
         }