Merge branch 'test' into 'master'

罗元桥

2021-06-30 e75b4aa72e9f260912a96a9bc36b58f9985862b0

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

@@ -56,4 +56,11 @@
    @ApiModelProperty(value = "性别（1.男 2.女）")
   private String sex;

   @ApiModelProperty(value = "时间")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

   @ApiModelProperty(value = "房屋人口关联id")
   private Long housePopulationId;

}