Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-17 f721ee13dc5f95f607bb25b09f73cae6a7123ed9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.user;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
@@ -9,6 +10,7 @@

@Data
@ApiModel("房屋成员信息")
@EncryptDecryptClass
public class ComHouseMemberVo {

    @ApiModelProperty("房屋成员用户id")