Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 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);
}