Merge branch 'fhx-prod-热门活动' into master-prod-new

fhx

2023-08-07 1f958e1435689b008e04f9d3c6d5133d0c3a9b8c

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