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

优化

See merge request quanshu/mp-server!782

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

@@ -292,8 +292,9 @@ public class MarketingController extends BaseApiController {
                 return userMarketingListVO;
             }).collect(Collectors.toList());
         }
-
-        return getDataTable(userMarketingListVOList);
+        TableDataInfo dataTable = getDataTable(userMarketingListVOList);
+        dataTable.setRows(userMarketingListVOList);
+        return dataTable;
     }
 
     @PostMapping("/detail/{id}")