From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java |    2 ++
 1 files changed, 2 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..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
@@ -87,10 +87,12 @@
 	/**
 	 * 对象类型(1=平台,2=城市管理员,3=门店)
 	 */
+	@TableField("objectType")
 	private Integer objectType;
 	/**
 	 * objectId
 	 */
+	@TableField("objectId")
 	private Integer objectId;
 
 

--
Gitblit v1.7.1