Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-11-14 262d511f52c7530f6f3ddbf595264f9880b4df4f

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

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

    /**是否处理可是*/
    private Integer isEditFamiliesRoom = 0;

    public UserParamDto() {
    }