From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 07 三月 2025 16:16:18 +0800 Subject: [PATCH] art: 选择设备查询逻辑修改, 点检工单新增时产线逻辑修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/StreamOperation.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/StreamOperation.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/StreamOperation.java index 0749d12..80a575f 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/StreamOperation.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/StreamOperation.java @@ -38,6 +38,7 @@ /**鎿嶄綔*/ @Excel(name = "鎿嶄綔", width = 15) @ApiModelProperty(value = "鎿嶄綔") + @Dict(dicCode = "stream_operation") private java.lang.String operation; /**涓婁竴姝ユ搷浣淚D*/ @Excel(name = "涓婁竴姝ユ搷浣淚D", width = 15) @@ -46,17 +47,19 @@ /**鎿嶄綔浜�*/ @Excel(name = "鎿嶄綔浜�", width = 15) @ApiModelProperty(value = "鎿嶄綔浜�") + @Dict(dicCode = "id",dicText = "realname",dictTable = "sys_user") private java.lang.String userId; /**娴両D*/ @ApiModelProperty(value = "娴両D") private java.lang.String streamId; /**鎿嶄綔鏃堕棿*/ - @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 = "鎿嶄綔鏃堕棿") private java.util.Date createTime; /**鎿嶄綔鑺傜偣*/ @ApiModelProperty(value = "鎿嶄綔鑺傜偣") + @Dict(dicCode = "stream_node") private String operationNode; /**鎿嶄綔浜烘剰瑙�*/ @ApiModelProperty(value = "鎿嶄綔浜烘剰瑙�") -- Gitblit v1.9.3