Merge remote-tracking branch 'origin/rx-1116-营销生日券' into master-test

rx

2023-11-17 2438c8e6950ba4f1557e4de62ae8191150d9e213

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