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

优化

See merge request quanshu/mp-server!519

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

@@ -167,10 +167,6 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
             marketingAwards.setMarketingId(marketing.getId());
             marketingAwardsService.save(marketingAwards);
 
-            if (awardsParam.getPrizeList().size() > 1) {
-                throw new ServiceException("奖品目前暂时不能超过1个");
-            }
-
             for (MarketingAwardsPrizeParam prizeParam : awardsParam.getPrizeList()) {
                 MarketingAwardsPrize awardsPrize = new MarketingAwardsPrize();
                 BeanUtils.copyProperties(prizeParam, awardsPrize);