Merge branch 'master' into master-test

wangrenhuang

2023-11-13 499737916d0cb59092c04d6523d4607ff0a5556a

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


}