From 0920f23406e52e4c7149515797a317c836c9e065 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 10 Nov 2023 09:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/User.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 1ee5ef9..beba49b 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -1,6 +1,7 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -76,6 +77,9 @@
*/
private String wechat;
+
+ private Integer unitId;
+
/**
* ������������
*/
@@ -101,4 +105,10 @@
private String isDelete;
+ private String openId;
+
+ @TableField(exist = false)
+ private Integer unitCode;
+
+
}
--
Gitblit v1.8.0