Merge branch 'test_bak' into 'master'

罗元桥

2021-09-29 161b77a90e4743a96b083a0653c3ae4b8245f589

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseUserAdminVO.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,6 +15,9 @@
@EncryptDecryptClass
public class ComMngPopulationHouseUserAdminVO {

    @ApiModelProperty("实有人口id")
    private String id;

    @ApiModelProperty("姓名")
    private String name;