From e8406a4dc63dee04b2ecd8e75d60acd4594d5150 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期四, 16 五月 2024 15:39:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java |  190 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 190 insertions(+), 0 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
new file mode 100644
index 0000000..fa47aca
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -0,0 +1,190 @@
+package com.javaweb.geo.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.javaweb.common.annotation.Excel;
+import com.javaweb.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 璁惧鍑哄叆搴撹褰曞璞� js_device_log
+ * 
+ * @author cxy
+ * @date 2024-05-16
+ */
+public class DeviceLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 涓婚敭 */
+    private String id;
+
+    /** 鍑哄叆搴撳崟瀛愬彿 */
+    @Excel(name = "鍑哄叆搴撳崟瀛愬彿")
+    private String code;
+
+    /** 椤圭洰id */
+    private String projectId;
+
+    /** 椤圭洰鍚嶇О */
+    @Excel(name = "椤圭洰鍚嶇О")
+    private String projectName;
+
+    /** 璁惧id */
+    private String deviceId;
+
+    /** 璁惧鍚嶇О */
+    @Excel(name = "璁惧鍚嶇О")
+    private String deviceName;
+
+    /** 鍑哄叆搴撶被鍨嬶紙in /out锛� */
+    @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "i=n,/=out")
+    private String type;
+
+    /** 鍑哄叆搴撴椂闂� */
+    @Excel(name = "鍑哄叆搴撴椂闂�")
+    private String transactionDate;
+
+    /** 缁忓姙浜� */
+    @Excel(name = "缁忓姙浜�")
+    private String optUser;
+
+    /** 浣跨敤浜� */
+    @Excel(name = "浣跨敤浜�")
+    private String applyUser;
+
+    /** 鍑哄叆搴撴暟閲� */
+    @Excel(name = "鍑哄叆搴撴暟閲�")
+    private String number;
+
+    /** 鏃堕棿 */
+    private Date createDate;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setDeviceId(String deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setTransactionDate(String transactionDate) 
+    {
+        this.transactionDate = transactionDate;
+    }
+
+    public String getTransactionDate() 
+    {
+        return transactionDate;
+    }
+    public void setOptUser(String optUser) 
+    {
+        this.optUser = optUser;
+    }
+
+    public String getOptUser() 
+    {
+        return optUser;
+    }
+    public void setApplyUser(String applyUser) 
+    {
+        this.applyUser = applyUser;
+    }
+
+    public String getApplyUser() 
+    {
+        return applyUser;
+    }
+    public void setNumber(String number) 
+    {
+        this.number = number;
+    }
+
+    public String getNumber() 
+    {
+        return number;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("projectId", getProjectId())
+            .append("projectName", getProjectName())
+            .append("deviceId", getDeviceId())
+            .append("deviceName", getDeviceName())
+            .append("type", getType())
+            .append("transactionDate", getTransactionDate())
+            .append("optUser", getOptUser())
+            .append("applyUser", getApplyUser())
+            .append("number", getNumber())
+            .append("createDate", getCreateDate())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

--
Gitblit v1.9.1