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

Andru

2023-12-05 eb8bde2a729a276db70331e41e0d207da674ba9a

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

@@ -16,5 +16,7 @@
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**门店标识*/
    private List<String> shopIdList;

}