Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

 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;

}