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

chenjiahe

2023-12-25 c14ef66fa5e588f9b1a7424a5b4bc377762cc043

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

 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;


}