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

Andru

2023-11-08 2623b35166b8e08246b3ef5233b9e411125abd80

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

@@ -34,6 +34,8 @@
    private String loginCnName;
    /**登录员工唯一字符串*/
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

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