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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -52,7 +52,7 @@
    private String phone;

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

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