Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-30 ef212c321c6d833d69091e7491521f7d11984bfb

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