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

fwq

2023-12-05 d1c49f422ed80522020c1be841edc6e1f71a46d5

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

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

@@ -10,6 +10,8 @@
 * */
@Data
public class UserReportDto {
    /**过滤测试账号*/
    private Integer isFilterTestAccount;
    /**员工标识*/
    private String userId;
    /**开始时间*/
@@ -18,5 +20,15 @@
    private String endTime;
    /**门店标识*/
    private List<String> shopIdList;
    /**科室标识*/
    private List<String> roomList;
    /**医生标识*/
    private List<String> doctorIdList;
    /**会员等级*/
    private List<String> userLevelList;
    /**会员状态*/
    private List<String> userStatusList;
    /**增长中心映射项目*/
    private List<String> upProjectIdList;

}