Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-11-01 80af1ea4460da34eeb6c4f6d285168e2f24330b2

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

@@ -149,4 +149,6 @@
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);


}