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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -48,10 +48,11 @@
    private Integer politicalOutlook;

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

    @ApiModelProperty("关联实有房屋(0.否 1.是)")
    private String isHouse;
    private Long isHouse;

    @ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
    private Integer eventStatus;