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

fhx

2023-08-18 e4cf174db3dc02713bb0af0788a02bacba6a89fc

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

@@ -19,7 +19,10 @@

    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**渠道大类渠道标识集合*/
    private List<String> channelList;
    /**开始时间*/
    private Date startTime;
    /**结束时间*/