Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-10 5513e69c82a82eb6be786d5cb8e23b81bffc8636

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

@@ -14,6 +14,9 @@
@EncryptDecryptClass
public class ComMngPopulationHouseUserAdminVO {

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

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