Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

DESKTOP-71BH0QO\L、ming

2021-03-26 3ca7f722f25c1908bc4588c75dbde1f56a8d9877

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java

@@ -149,8 +149,8 @@
    /**
     * create_at
     */
    @DateTimeFormat(pattern = "yyyy/MM/dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("发布人名字")
    private String userName;