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

fwq

2023-07-25 870bdaf5f69097395bc8c3e92863de096802573e

 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;
}