From c6ff75126f7e5a795d503272280dd3d72bcdb294 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 10:35:58 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index 5293829..4a318c6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -6,6 +6,7 @@
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
@@ -64,8 +65,8 @@
/**
* wcs绔欑偣缂栧彿
*/
- @ApiModelProperty(value= "wcs绔欑偣缂栧彿")
- private String wcsCode;
+ @ApiModelProperty(value= "鐩爣浣嶇疆")
+ private String target;
/**
* 绔欑偣鏍囩
@@ -104,6 +105,10 @@
@TableLogic
private Integer deleted;
+ @ApiModelProperty(value= "宸烽亾")
+ private Integer channel;
+
+
/**
* 绉熸埛
*/
@@ -121,6 +126,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -134,6 +140,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
@@ -154,7 +161,7 @@
this.type = type;
this.site = site;
this.name = name;
- this.wcsCode = wcsCode;
+ this.target = wcsCode;
this.label = label;
this.device = device;
this.deviceCode = deviceCode;
--
Gitblit v1.9.1