From 4a36a12d40453f7686e5f2664f19601b9f6b9ae2 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 22 八月 2024 14:39:52 +0800
Subject: [PATCH] order status
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index ece7a09..38d20ca 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
@@ -30,7 +31,7 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@@ -63,9 +64,9 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
+ * 鐘舵��: 0:寰呯敓浜�,1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
*/
public Integer status;
/**
@@ -93,10 +94,27 @@
* 鍑虹珯鏃堕棿
*/
public Date outTime;
+
+ /**
+ * 鎶曞叆鏃堕棿
+ */
+ public Date inLineTime;
+ /**
+ * 浜у嚭鏃堕棿
+ */
+ public Date outLineTime;
+
/**
* 澶囨敞
*/
public String memo;
-
+ @TableField(exist = false)
+ public String planName;
+ @TableField(exist = false)
+ public String stationName;
+ @TableField(exist = false)
+ public String updateUserName;
+ @TableField(exist = false)
+ public String assistantNames;
}
--
Gitblit v1.8.0