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

Andru

2023-11-24 a5371d7d5debbd35b6d75ffab97efb4a4636e71e

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

* master-prod-new:
  tmk业绩汇总列表补充搜索条件
  添加参数

 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java

@@ -166,8 +166,10 @@
    private String mainAppeal;
    private String minorAppeal;

    /**是否处理可是*/
    /**是否处理科室*/
    private Integer isEditFamiliesRoom = 0;
    /**是否发送修改科室通知*/
    private Integer isEditFRSentNotice = 0;

    public UserParamDto() {
    }
@@ -187,9 +189,4 @@
    public static final String CATEGORY_EMPLOYEE = "employee";
    /**渠道类别-自己来*/
    public static final String CATEGORY_ONESELF = "oneself";





}