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

chenjiahe

2023-07-03 00b97acec0f98d7f4f4a62e16ca182823ce983e2

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

@@ -25,6 +25,12 @@
    @PostMapping(value = "/user/card/delay/cardBag")
    Result delayCardBag(@RequestBody CardBagDto cardBagDto);

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


}