Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

@@ -14,5 +14,8 @@
    private List<UserReportDto> list;
    /**过滤测试账号*/
    private Integer isFilterTestAccount;

    /**专区标识*/
    private List<String> zoneList;
    /**专区用户标识*/
    private List<String> userIdList;
}