From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java
index d5c4cdd..0d22183 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -33,13 +34,20 @@
@TableField("project_name")
private String projectName;
- @ApiModelProperty(value = "上级id 为0表示片区")
+ @ApiModelProperty(value = "上级id 为0表示项目部")
@TableField("parent_id")
private String parentId;
+ @ApiModelProperty(value = "编号")
+ @TableField("code")
+ private String code;
@ApiModelProperty(value = "状态 1启用2禁用")
@TableField("status")
private Integer status;
-
+ @TableField(exist = false)
+ private List<TProjectDept> children;
+ @ApiModelProperty("部门人数")
+ @TableField(exist = false)
+ private Integer userCount;
}
--
Gitblit v1.7.1