From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
index a72f252..f799ecd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysLogininfor.java
@@ -40,6 +40,9 @@
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
+    @Excel(name = "登陆端0系统1商户端2员工端3用户端")
+    private Integer loginFrom;
+
     public Long getInfoId()
     {
         return infoId;
@@ -99,4 +102,12 @@
     {
         this.accessTime = accessTime;
     }
+
+    public Integer getLoginFrom() {
+        return loginFrom;
+    }
+
+    public void setLoginFrom(Integer loginFrom) {
+        this.loginFrom = loginFrom;
+    }
 }
\ No newline at end of file

--
Gitblit v1.7.1