Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2024-02-23 e7d554f4f8f79eafaa2de3abe036d21e300fd14a

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

@@ -34,6 +34,10 @@
    private String loginCnName;
    /**登录员工唯一字符串*/
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否查询复购数据,0否1是*/
    private Integer isSelectRepurchase = 0;

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