Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

 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;