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

Andru

2023-10-27 4337de343f64e2078c1c426e5d0dc4de428191b9

 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() {
    }