From 60adcd3df38785350f976ac803fde614d88dc5f3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 17 Apr 2023 11:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/dao/auth/DeptDao.java   |  6 ++++-
 .../com/glxp/api/entity/auth/DeptEntity.java  | 24 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java
index 55ebc8f6..c4f33bbf 100644
--- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java
@@ -1,13 +1,17 @@
 package com.glxp.api.dao.auth;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.DeptEntity;
+import com.glxp.api.entity.auth.DeptUserEntity;
 import com.glxp.api.req.auth.FilterInvWarehouseRequest;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
-public interface DeptDao {
+@Mapper
+public interface DeptDao extends BaseMapperPlus<DeptDao, DeptEntity, DeptEntity> {
 
     List<DeptEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
index ac6034d6..b8e94479 100644
--- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
+++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
@@ -1,33 +1,55 @@
 package com.glxp.api.entity.auth;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
+@TableName(value = "auth_dept")
 public class DeptEntity {
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    @TableField(value = "pid")
     private Integer pid;
+    @TableField(value = "code;")
     private String code;
+    @TableField(value = "name")
     private String name;
+    @TableField(value = "advanceType")
     private Boolean advanceType;
+    @TableField(value = "isDefault")
     private Boolean isDefault;
+    @TableField(value = "status")
     private Integer status;
+    @TableField(value = "updateTime")
     private Date updateTime;
+    @TableField(value = "remark")
     private String remark;
+    @TableField(value = "level")
     private Integer level;
+    @TableField(value = "pcode")
     private String pcode;
+    @TableField(value = "pName")
     private String pName;
 
     /**
      * 第三方仓库ID
      */
+    @TableField(value = "thirdId")
     private String thirdId;
+    @TableField(value = "thirdId1")
     private String thirdId1;
+    @TableField(value = "thirdId2")
     private String thirdId2;
+    @TableField(value = "thirdId3")
     private String thirdId3;
+    @TableField(value = "thirdId4")
     private String thirdId4;
-
+    @TableField(value = "spUse")
     private Boolean spUse;
 
 }