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

fwq

2024-07-08 6a3f8907a2f9d240f8a07e7283682286d2b52c75

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -53,6 +53,7 @@
    private Integer isTmk = 0;
    /**是否查询年龄:0否1是*/
    private Integer isYear = 0;

    /**是否查询优惠券信息,0否1是*/
    private Integer isSelectCoupon = 0;

}