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

优化

See merge request quanshu/mp-server!534

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

@@ -308,7 +308,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
             throw new ServiceException("活动不存在");
         }
         // 未开启的活动不能助力
-        if (MarketingStatusEnum.ON.getValue().equals(marketing.getIsOn())) {
+        if (!MarketingStatusEnum.ON.getValue().equals(marketing.getIsOn())) {
             throw new ServiceException("活动未开启~");
         }
         Date now = DateUtils.getNowDate();