From 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 16:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/account/pojo/AccountSubject.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/pojo/AccountSubject.java b/src/main/java/com/ruoyi/account/pojo/AccountSubject.java
index 49ba3da..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("绉戠洰缂栫爜(鍞竴鏍囪瘑)")

--
Gitblit v1.9.3