From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java
index 407a32f..1be9009 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java
@@ -1,13 +1,13 @@
package com.panzhihua.service_user.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
/**
* 部门表 sys_dept
@@ -15,12 +15,11 @@
* @author ruoyi
*/
@Data
-public class SysDeptDO implements Serializable
-{
+public class SysDeptDO implements Serializable {
private static final long serialVersionUID = 1L;
/** 部门ID */
- @TableId(type= IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long deptId;
/** 父部门ID */
@@ -52,9 +51,8 @@
/** 父部门名称 */
private String parentName;
-
+
/** 子部门 */
private List<SysDeptDO> children = new ArrayList<SysDeptDO>();
-
}
--
Gitblit v1.7.1