Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -22,6 +22,8 @@
    private List<String> groupIdList;
    /**用户状态*/
    private List<String> userStatusList;
    /**品项名称*/
    private List<String> projectNameList;
    /**执行数*/
    private Integer deductionNum;
    /**开始时间*/