Merge branch 'master-prod-new' into master-test

Andru

2023-11-20 95dd7d30c396ddc175a794db43216f995c067e5d

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java

@@ -26,11 +26,17 @@
    Result delayCardBag(@RequestBody CardBagDto cardBagDto);

    /**
     * 开放平台-卡包可抵扣信息
     * 开放平台-卡包可抵扣信息（单条）
     * @return 转化对象UserCardVo
     */
    @PostMapping(value = "/user/card/get/deduction-data")
    Result deductionData(@RequestBody CardBagDto cardBagDto);

    /**
     * 开放平台-卡包可抵扣信息（集合）
     * @return 转化对象userCardMapVo
     */
    @PostMapping(value = "/user/card/get/deduction-data/list")
    Result deductionDataList(@RequestBody CardBagDto cardBagDto);

}