Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java

@@ -103,5 +103,9 @@
    @PostMapping("/base/pointMerchars/queryFee")
    HashMap<String, Object> queryFee(QueryDataFee queryDataFee);


    /**
     * 根据id查询
     */
    @RequestMapping("/base/pointMerchars/getById")
    PointsMerchandise getById(@RequestBody Integer id);
}