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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

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

@@ -44,6 +44,6 @@
    Result getConsumablesCouponList(@RequestBody PageDto pageDto);

    /** 检查优惠券商品是否可购买 */
    @PostMapping(value = "/consumables/checkConsumablesCouponIsBuy")
    @PostMapping(value = "/check/consumables/coupon/isBuy")
    Result checkConsumablesCouponIsBuy(@RequestBody ConsumablesDto dto);
}