Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java

@@ -18,7 +18,7 @@
    public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request);

    @PostMapping("/base/introduce/getGiftList")
    IntroduceRewards getGiftList(@RequestBody String cityCode);
    List<IntroduceRewards> getGiftList(@RequestBody String cityCode);


}