Merge branch 'test' into 'master'

罗元桥

2021-07-01 683b03adfb1b4854b00f4531742b480fdcf5401c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java

@@ -48,6 +48,7 @@
    private Integer politicalOutlook;

    @ApiModelProperty("联系方式")
    @EncryptDecryptField
    private String phone;

    @ApiModelProperty("关联实有房屋(0.否 1.是)")