Merge branch 'master' into master-test

wangrenhuang

2023-09-25 195af7b92b0aa5534cb28d25aa589f2d2545c7e9

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

@@ -16,10 +16,14 @@
    private String month;
    /**月份:yyyy-MM-dd*/
    private String day;

    /**用户增长渠道:1是,0否*/
    private Integer selectUser;
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**渠道大类渠道标识集合*/
    private List<String> channelList;
    /**开始时间*/
    private Date startTime;
    /**结束时间*/