From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java
index 016c2f7..e7ea807 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java
@@ -2,6 +2,8 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelNotation;
+import org.dromara.common.excel.annotation.ExcelRequired;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.demo.domain.TestDemo;
@@ -36,30 +38,35 @@
/**
* 閮ㄩ棬id
*/
+ @ExcelRequired
@ExcelProperty(value = "閮ㄩ棬id")
private Long deptId;
/**
* 鐢ㄦ埛id
*/
+ @ExcelRequired
@ExcelProperty(value = "鐢ㄦ埛id")
private Long userId;
/**
* 鎺掑簭鍙�
*/
+ @ExcelRequired
@ExcelProperty(value = "鎺掑簭鍙�")
private Integer orderNum;
/**
* key閿�
*/
+ @ExcelNotation(value = "娴嬭瘯key")
@ExcelProperty(value = "key閿�")
private String testKey;
/**
* 鍊�
*/
+ @ExcelNotation(value = "娴嬭瘯value")
@ExcelProperty(value = "鍊�")
private String value;
--
Gitblit v1.9.3