From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
index 5ea5bd6..519169e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
@@ -87,12 +87,23 @@
 	/**
 	 * 对象类型(1=平台,2=城市管理员,3=门店)
 	 */
+	@TableField("objectType")
 	private Integer objectType;
 	/**
 	 * objectId
 	 */
+	@TableField("objectId")
 	private Integer objectId;
+	@TableField("idCard")
+	private String idCard;
 
+	public String getIdCard() {
+		return idCard;
+	}
+
+	public void setIdCard(String idCard) {
+		this.idCard = idCard;
+	}
 
 	public Integer getId() {
 		return id;

--
Gitblit v1.7.1