From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
index cbe33e2..5a95c53 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
@@ -37,6 +37,7 @@
     /** 鐘舵�侊紙0姝e父 1鍋滅敤锛� */
     @Excel(name = "鐘舵��", readConverterExp = "0=姝e父,1=鍋滅敤")
     private String status;
+    private String remark;
 
     public Long getDictId()
     {
@@ -97,4 +98,14 @@
             .append("remark", getRemark())
             .toString();
     }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

--
Gitblit v1.9.3