Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

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

@@ -27,8 +27,8 @@
    TravelDetailService travelDetailService;

    @GetMapping()
     public AjaxResult getDataByCid(@PathParam("cid") Long cid){
        List<TravelDetail> travelDetailList = travelDetailService.getDataByCid(cid);
     public AjaxResult getDataByCid(@PathParam("cid") Long cid,TravelDetail travelDetail){
        List<TravelDetail> travelDetailList = travelDetailService.getDataByCid(cid,travelDetail);
        return AjaxResult.success(travelDetailList);
    }