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

chenjiahe

2023-08-08 f18d57769635a2bc4eda0fc5e93bbe928e3c19c7

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

@@ -35,4 +35,11 @@
     */
    @PostMapping(value = "/consumables/update/list")
    Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);

    /**
     * 获取优惠券商品列表
     * @return Result
     */
    @PostMapping(value = "/consumables/coupon/list")
    Result getConsumablesCouponList(@RequestBody PageDto pageDto);
}