Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 a1a6321c059740de69836bb10fa9459e5b916ab1

 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;