From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
index fb3d97d..352cdba 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
@@ -40,7 +40,7 @@
@Dict(dicCode = "stream_node")
private java.lang.String status;
/**createTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
@@ -63,4 +63,6 @@
private java.lang.String type;
@TableField(exist = false)
private List<ABCAssessment> assessmentList;
+ @TableField(exist = false)
+ private String areaId;
}
--
Gitblit v1.9.3