Merge branch 'fhx-prod-FDD' into master-test

fhx

2024-03-04 b156efaa0d9bc62c95d87f0b9ea916669c6c1d3e

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

@@ -166,6 +166,11 @@
    private String mainAppeal;
    private String minorAppeal;

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

    public UserParamDto() {
    }

@@ -184,9 +189,4 @@
    public static final String CATEGORY_EMPLOYEE = "employee";
    /**渠道类别-自己来*/
    public static final String CATEGORY_ONESELF = "oneself";





}