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

fwq

2024-02-05 98fb96938258c6b966e007259860c9cdc8d5e2f2

 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;


}