From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 26 五月 2024 22:26:25 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java index 22fa10d..6f9ac20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java @@ -27,11 +27,17 @@ 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); } + @GetMapping("/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(travelDetailService.getById(id)); + } + @PostMapping() public AjaxResult addData(@RequestBody TravelDetail travelDetail){ travelDetailService.save(travelDetail); -- Gitblit v1.9.1