Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new

rx

2023-08-21 d8afbdc39cd6e7739054fc1cc21898e0b81216d0

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

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