Merge branch 'master_xgh_我的客户迭代' into 'developer'

营销记录

See merge request !371

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -291,10 +291,14 @@ public class MemberMarketingController extends WebBaseController {
         return RestResponse.successResult(map);
     }
 
-    @RequestMapping("page-ai-member-log")
+    @RequestMapping("/member/page-ai-member-log")
     @ResponseBody
     public RestResponse<Object> pageAiMemberMarketingLog(String memberId, String planName, String aiStartTime,
-            String aiEndTime, PageQo pageQo) {
+            String aiEndTime, @RequestParam(defaultValue = "1") int currentPage,
+            @RequestParam(defaultValue = "20") int pageSize) {
+        PageQo pageQo = new PageQo() ;
+        pageQo.setPageNum(currentPage);
+        pageQo.setPageSize(pageSize);
         ServiceResponse<Page<AiMemberLogListDTO>> res = aiMemberLogApiService.pageAiMemberMarketingLog(memberId,
                 planName, Lists.newArrayList(0, 1, 6, 8), aiStartTime, aiEndTime, pageQo.getBasePageInfo());
         if (res.isSuccess()) {