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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

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

@@ -56,4 +56,12 @@
    @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")
   @JsonSerialize(using = ToStringSerializer.class)
   private Long housePopulationId;

}