Merge remote-tracking branch 'origin/master'

jinquanOu

2024-06-11 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java

@@ -52,7 +52,9 @@



        return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
        AjaxResult res = travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
        System.out.println(res);
        return res;
    }

    @GetMapping("/{id}")