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

优化

See merge request quanshu/mp-server!546

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

@@ -336,6 +336,8 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         }
 
         MarketingUserCode marketingUserCode = new MarketingUserCode();
+        // 设置活动id
+        marketingUserCode.setMarketingId(marketingHelpParam.getMarketingId());
         // 设置抽奖码
         marketingUserCode.setCode(code);
         // 设置被助力人