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

fwq

2024-05-24 b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b

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

@@ -162,6 +162,15 @@
    /**转诊信息*/
    private UserTransferDto transferRecord;

    /**主要诉求**/
    private String mainAppeal;
    private String minorAppeal;

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

    public UserParamDto() {
    }

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





}