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

fhx

2023-10-12 607dd05591843f0691a3e38fbb2c790a99c13f09

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

@@ -24,4 +24,7 @@
    private String sleepTime;
    /**门店列表标识*/
    private List<String> shopIdList;

    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
}