Merge branch 'master' into master-test

wangrenhuang

2023-12-25 c002644e6425061aaefdcabd69553459990db8e3

Merge branch 'master' into master-test

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

@@ -49,5 +49,10 @@
    private Integer isEvaluate;
    /**会员类型*/
    private Integer memberType;
    /**是否查询tmk信息:0否1是*/
    private Integer isTmk = 0;
    /**是否查询年龄:0否1是*/
    private Integer isYear = 0;


}