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

fhx

2023-12-18 e192c9e13596244cbd4e7912331c19bcc92f2e6c

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

@@ -45,7 +45,9 @@
    private Date startTime;
    /**结束时间*/
    private Date endTime;
    //是否评价
    /**是否评价*/
    private Integer isEvaluate;
    /**会员类型*/
    private Integer memberType;

}