From fd68d9efbe525e9210f7013c1f103f197f01841c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/entity/User.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 cf22cd8..0ae2a49 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;
+
/**
* ������������
*/
@@ -100,10 +104,8 @@
*/
private String isDelete;
+ @TableField(exist = false)
+ private Integer unitCode;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0