From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 20 一月 2025 19:23:17 +0800 Subject: [PATCH] 合并代码 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java index ddab429..b29a0a4 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java @@ -87,6 +87,9 @@ @PostMapping("/base/pointMerchars/addOther") Boolean addOther(@RequestBody String pam); + @PostMapping("/base/pointMerchars/addOther1") + Boolean addOther1(@RequestBody String pam1); + @PostMapping("/base/pointMerchars/addCitys") Boolean addCitys(@RequestBody List<Map<String, String>> objects); @@ -103,5 +106,9 @@ @PostMapping("/base/pointMerchars/queryFee") HashMap<String, Object> queryFee(QueryDataFee queryDataFee); - + /** + * 根据id查询 + */ + @RequestMapping("/base/pointMerchars/getById") + PointsMerchandise getById(@RequestBody Integer id); } -- Gitblit v1.7.1