Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -492,7 +492,7 @@ public class HmLinkController {
 
     @RequestMapping("statistics/clerk")
     public RestResponse<Object> statisticsClerk(Long linkId, String storeSearchParams, String clerkSearchParams,
-            Date startTime, Date endTime) {
+            Date startTime, Date endTime,BasePageInfo basePageInfo) {
         List<HmLinkStatisticsClerkVO> list = new ArrayList<>();
         list.add(new HmLinkStatisticsClerkVO());
         Page<HmLinkStatisticsClerkVO> page = new Page<>();
@@ -500,7 +500,7 @@ public class HmLinkController {
         return RestResponse.successResult(page);
     }
 
-    @RequestMapping("statistics/page")
+    @RequestMapping("statistics/log")
     public RestResponse<Object> statisticsDetail(Long linkId, String clerkId, Date startTime, Date endTime,
             BasePageInfo basePageInfo) {
         List<WxUserAddLogVO> list = new ArrayList<>();