From b9ab963139d512287995b7aa00c5608c23ad0b2f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 14:05:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/account/pojo/AccountSubject.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountSubject.java b/src/main/java/com/ruoyi/account/pojo/AccountSubject.java
index 3516f8c..9616324 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountSubject.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountSubject.java
@@ -39,6 +39,12 @@
private Long id;
/**
+ * 鐖剁鐩甀D锛堜负绌鸿〃绀烘牴鑺傜偣锛�
+ */
+ @ApiModelProperty("鐖剁鐩甀D锛堜负绌鸿〃绀烘牴鑺傜偣锛�")
+ private Long parentId;
+
+ /**
* 绉戠洰缂栫爜(鍞竴鏍囪瘑)
*/
@ApiModelProperty("绉戠洰缂栫爜(鍞竴鏍囪瘑)")
@@ -51,9 +57,9 @@
private String subjectName;
/**
- * 绉戠洰绫诲瀷(瀛楀吀閰嶇疆)
+ * 绉戠洰绫诲瀷
*/
- @ApiModelProperty("绉戠洰绫诲瀷(瀛楀吀閰嶇疆)")
+ @ApiModelProperty("绉戠洰绫诲瀷")
private String subjectType;
/**
--
Gitblit v1.9.3