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

优化

See merge request quanshu/mp-server!787

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

@@ -129,6 +129,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         marketing.setRealNum(0);
         marketing.setIsOn(MarketingStatusEnum.OFF.getValue());
         marketing.setIsSend(0);
+        marketing.setIsSendLottery(0);
         marketing.setTriggerStatus(0);
         marketing.setCreatedTime(null);
         Assert.isTrue(this.save(marketing), "复制营销活动失败");