Merge branch 'master-stander' into master-jiayan

fwq

10 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

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

@@ -36,6 +36,8 @@
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否查询复购数据,0否1是*/
    private Integer isSelectRepurchase = 0;

    public List<String> getShopIdList() {
        if(shopIdList == null){