From 11bfde3dc1f8fbb0bfd681e7ba35d491a4f52a06 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期六, 25 五月 2024 22:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
index d058d5e..83ea619 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
@@ -74,13 +74,6 @@
private String isDefault;
/**
- * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
- */
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_normal_disable")
- private String status;
-
- /**
* 澶囨敞
*/
@ExcelProperty(value = "澶囨敞")
--
Gitblit v1.9.3