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

优化

See merge request quanshu/mp-server!549

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

@@ -127,7 +127,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         List<MarketingUserCode> realUserList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getMarketingId, marketing.getId())
                 .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
-                .groupBy(MarketingUserCode::getMarketingId));
+                .groupBy(MarketingUserCode::getUserId));
         int realNum = 0;
         if (CollectionUtils.isNotEmpty(realUserList)) {
             realNum = realUserList.size();
@@ -358,7 +358,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         List<MarketingUserCode> realUserList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getMarketingId, marketing.getId())
                 .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
-                .groupBy(MarketingUserCode::getMarketingId));
+                .groupBy(MarketingUserCode::getUserId));
         int realNum = 0;
         if (CollectionUtils.isNotEmpty(realUserList)) {
             realNum = realUserList.size();