Merge branch 'test_screen' into 'master'

罗元桥

2021-06-21 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52

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

@@ -164,9 +164,12 @@
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date submitDate;

    @ApiModelProperty(value = "创建人")
    @ApiModelProperty(value = "创建人id")
   private Long createBy;

   @ApiModelProperty(value = "创建人姓名")
   private String creator;

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