Merge branch 'master-prod-new' into master-test

fhx

2023-08-10 5307c471ea46a404ce40cd72dce30f73d05715cc

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -29,4 +29,8 @@
    private String endTime;
    /**类型*/
    private Integer type;
    /**是否新会员*/
    private Integer isNewUser;
    /**是否首天*/
    private Integer isBothOne;
}