From 488b9158fc873d228c2c0106050ece8272a49653 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 25 十二月 2024 10:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
index c41be07..de08a27 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
@@ -36,7 +36,7 @@
@ApiModelProperty("上级区域id")
@TableField("PARENT_ID")
- private Integer parentId;
+ private Long parentId;
@ApiModelProperty("树编码")
@TableField("TREE_CODE")
@@ -82,5 +82,8 @@
@TableField("UNIFIED_SOCIAL_CREDIT_CODE")
private String unifiedSocialCreditCode;
-
+ @ApiModelProperty("区域")
+ @TableField("REGION")
+ private String region;
+
}
--
Gitblit v1.7.1