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

ANDRU-PC\Andru

2023-09-27 112f94d84a0051d20761b42e0f5663f3f02c9a63

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

 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){

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

@@ -22,4 +22,7 @@
    private List<String> employeeIdList;
    /**等级列表*/
    private List<String> memberLevelList;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

}