Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 a6208e99d08435959b234141f0fe0d4f81c47b00

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

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