Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-27 1918bee03c0924732c60c8db14a37a70cf2e0acc

Merge branch 'master' into master-test

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

@@ -14,10 +14,14 @@
    private String shopId;
    /**当前时间*/
    private String nowTime;
    /**是否时间段筛选*/
    private Integer isSelectPeriod = 0;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**沉睡时间*/
    private String sleepTime;
    /**门店列表标识*/
    private List<String> shopIdList;
}