From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期三, 24 七月 2024 17:34:27 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 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..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 @@ -84,7 +84,26 @@ * 保留字段 */ private Integer version; + /** + * 对象类型(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; @@ -207,6 +226,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