From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 e4b03b7..e4e66e6 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
@@ -84,6 +84,16 @@
      * 保留字段
      */
 	private Integer version;
+	/**
+	 * 对象类型(1=平台,2=城市管理员,3=门店)
+	 */
+	@TableField("objectType")
+	private Integer objectType;
+	/**
+	 * objectId
+	 */
+	@TableField("objectId")
+	private Integer objectId;
 
 
 	public Integer getId() {
@@ -207,6 +217,22 @@
 		this.version = version;
 	}
 
+	public Integer getObjectType() {
+		return objectType;
+	}
+
+	public void setObjectType(Integer objectType) {
+		this.objectType = objectType;
+	}
+
+	public Integer getObjectId() {
+		return objectId;
+	}
+
+	public void setObjectId(Integer objectId) {
+		this.objectId = objectId;
+	}
+
 	@Override
 	protected Serializable pkVal() {
 		return this.id;

--
Gitblit v1.7.1