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

优化

See merge request quanshu/mp-server!783

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/MarketingController.java

@@ -292,7 +292,7 @@ public class MarketingController extends BaseApiController {
                 return userMarketingListVO;
             }).collect(Collectors.toList());
         }
-        TableDataInfo dataTable = getDataTable(userMarketingListVOList);
+        TableDataInfo dataTable = getDataTable(list);
         dataTable.setRows(userMarketingListVOList);
         return dataTable;
     }