From 306749fa2e6ea7609468889cb56473770d0a26cc Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 14:44:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
index fa47aca..9e7b6de 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -17,7 +17,7 @@
     private static final long serialVersionUID = 1L;
 
     /** 涓婚敭 */
-    private String id;
+    private Integer id;
 
     /** 鍑哄叆搴撳崟瀛愬彿 */
     @Excel(name = "鍑哄叆搴撳崟瀛愬彿")
@@ -33,24 +33,31 @@
     /** 璁惧id */
     private String deviceId;
 
+    /** 璁惧缂栫爜 */
+    private String deviceCode;
+
     /** 璁惧鍚嶇О */
     @Excel(name = "璁惧鍚嶇О")
     private String deviceName;
 
-    /** 鍑哄叆搴撶被鍨嬶紙in /out锛� */
-    @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "i=n,/=out")
+    /** 绫诲瀷锛堣澶囷紝鏉愭枡锛� */
+    @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "绫诲瀷锛堣澶囷紝鏉愭枡锛�")
     private String type;
 
-    /** 鍑哄叆搴撴椂闂� */
-    @Excel(name = "鍑哄叆搴撴椂闂�")
-    private String transactionDate;
+    /** 鍑哄簱鏃堕棿 */
+    @Excel(name = "鍑哄簱鏃堕棿")
+    private String outboundDate;
+
+    /** 鍏ュ簱鏃堕棿 */
+    @Excel(name = "鍏ュ簱鏃堕棿")
+    private String inboundDate;
 
     /** 缁忓姙浜� */
     @Excel(name = "缁忓姙浜�")
     private String optUser;
 
     /** 浣跨敤浜� */
-    @Excel(name = "浣跨敤浜�")
+    @Excel(name = "璐熻矗浜�")
     private String applyUser;
 
     /** 鍑哄叆搴撴暟閲� */
@@ -60,16 +67,15 @@
     /** 鏃堕棿 */
     private Date createDate;
 
-    public void setId(String id) 
-    {
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
         this.id = id;
     }
 
-    public String getId() 
-    {
-        return id;
-    }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
@@ -110,7 +116,15 @@
         this.deviceName = deviceName;
     }
 
-    public String getDeviceName() 
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceName()
     {
         return deviceName;
     }
@@ -119,25 +133,31 @@
         this.type = type;
     }
 
-    public String getType() 
-    {
+    public String getType() {
         return type;
     }
-    public void setTransactionDate(String transactionDate) 
-    {
-        this.transactionDate = transactionDate;
+
+    public String getOutboundDate() {
+        return outboundDate;
     }
 
-    public String getTransactionDate() 
-    {
-        return transactionDate;
+    public void setOutboundDate(String outboundDate) {
+        this.outboundDate = outboundDate;
     }
-    public void setOptUser(String optUser) 
-    {
+
+    public String getInboundDate() {
+        return inboundDate;
+    }
+
+    public void setInboundDate(String inboundDate) {
+        this.inboundDate = inboundDate;
+    }
+
+    public void setOptUser(String optUser) {
         this.optUser = optUser;
     }
 
-    public String getOptUser() 
+    public String getOptUser()
     {
         return optUser;
     }
@@ -177,9 +197,8 @@
             .append("projectId", getProjectId())
             .append("projectName", getProjectName())
             .append("deviceId", getDeviceId())
+            .append("deviceCode", getDeviceCode())
             .append("deviceName", getDeviceName())
-            .append("type", getType())
-            .append("transactionDate", getTransactionDate())
             .append("optUser", getOptUser())
             .append("applyUser", getApplyUser())
             .append("number", getNumber())

--
Gitblit v1.9.1