From 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十一月 2024 10:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/system/entity/UserLogin.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index 52d5a5a..a585ee8 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -7,12 +7,15 @@
 import com.zy.system.service.UserService;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @TableName("sys_user_login")
+@Data
 public class UserLogin implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -22,6 +25,13 @@
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+
+    /**
+     * 鎵�灞為」鐩�
+     */
+    @ApiModelProperty(value= "鎵�灞為」鐩�")
+    @TableField("host_id")
+    private Long hostId;
 
     /**
      * 鍛樺伐
@@ -40,12 +50,26 @@
     @TableField("create_time")
     private Date createTime;
 
+    /**
+     * 鐧诲綍绯荤粺
+     */
+    @TableField("system")
+    private String system;
+
     public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
+    }
+
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(Long hostId) {
+        this.hostId = hostId;
     }
 
     public Long getUserId() {
@@ -87,5 +111,11 @@
         this.createTime = createTime;
     }
 
+    public String getSystem() {
+        return system;
+    }
 
+    public void setSystem(String system) {
+        this.system = system;
+    }
 }

--
Gitblit v1.9.1