From 9d03266e3a6fcc4137cfd863f273061684e2fbf7 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Mon, 8 Sep 2025 02:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/dromara/xg/domain/vo/XgHolidayStayVo.java | 13 +------------
.../xg/xgss/holidayStay/holidayStay/index-sg.vue | 6 +++---
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgHolidayStayVo.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgHolidayStayVo.java
index c7887d40..c6bc2dc6 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgHolidayStayVo.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgHolidayStayVo.java
@@ -14,8 +14,6 @@ import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
-
-
/**
* 假期留宿管理视图对象 xg_holiday_stay
*
@@ -39,8 +37,6 @@ public class XgHolidayStayVo implements Serializable {
/**
* 删除标志（0代表存在 1代表删除）
*/
- @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除")
private Long deleted;
/**
@@ -179,8 +175,7 @@ public class XgHolidayStayVo implements Serializable {
/**
* 留宿原因（必填）
*/
- @ExcelProperty(value = "留宿原因", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "必=填")
+ @ExcelProperty(value = "留宿原因")
private String stayReason;
/**
@@ -218,26 +213,21 @@ public class XgHolidayStayVo implements Serializable {
/**
* 附件OSS文件ID，多个用逗号分隔（申请材料、证明文件等）
*/
- @ExcelProperty(value = "附件OSS文件ID，多个用逗号分隔", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "申=请材料、证明文件等")
private String attachmentOssIds;
/**
* 扩展字段1
*/
- @ExcelProperty(value = "扩展字段1")
private String extField1;
/**
* 扩展字段2
*/
- @ExcelProperty(value = "扩展字段2")
private String extField2;
/**
* 扩展字段3
*/
- @ExcelProperty(value = "扩展字段3")
private String extField3;
/**
@@ -246,5 +236,4 @@ public class XgHolidayStayVo implements Serializable {
@ExcelProperty(value = "备注信息")
private String remark;
-
}
diff --git a/web/src/views/xg/xgss/holidayStay/holidayStay/index-sg.vue b/web/src/views/xg/xgss/holidayStay/holidayStay/index-sg.vue
index 95742183..8e042dea 100644
--- a/web/src/views/xg/xgss/holidayStay/holidayStay/index-sg.vue
+++ b/web/src/views/xg/xgss/holidayStay/holidayStay/index-sg.vue
@@ -160,9 +160,9 @@
>删除
-->
-
+
+ 导出
+