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 |    3 +++
 1 files changed, 3 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 0ae2a49..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
@@ -104,6 +104,9 @@
      */
     private String isDelete;
 
+
+    private String openId;
+
     @TableField(exist = false)
     private Integer unitCode;
 

--
Gitblit v1.8.0