From 13efdf15776e0c7f7009f6a467cf144d36724c29 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Sat, 16 Aug 2025 10:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xg/domain/vo/XgDormViolationVo.java       | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java
index dd0cbc81..1f47a323 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormViolationVo.java
@@ -14,8 +14,6 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
-
-
 /**
  * 宿舍违纪记录视图对象 xg_dorm_violation
  *
@@ -34,13 +32,12 @@ public class XgDormViolationVo implements Serializable {
      * 违纪记录ID（主键）
      */
     @ExcelProperty(value = "违纪记录ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "主=键")
     private Long id;
 
     /**
      * 学生ID
      */
-    @ExcelProperty(value = "学生ID")
+    // @ExcelProperty(value = "学生ID")
     private Long studentId;
 
     /**
@@ -58,7 +55,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 学院ID
      */
-    @ExcelProperty(value = "学院ID")
+    // @ExcelProperty(value = "学院ID")
     private Long collegeId;
 
     /**
@@ -70,7 +67,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 专业ID
      */
-    @ExcelProperty(value = "专业ID")
+    // @ExcelProperty(value = "专业ID")
     private Long majorId;
 
     /**
@@ -82,7 +79,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 班级ID
      */
-    @ExcelProperty(value = "班级ID")
+    // @ExcelProperty(value = "班级ID")
     private Long classId;
 
     /**
@@ -94,7 +91,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 校区ID
      */
-    @ExcelProperty(value = "校区ID")
+    // @ExcelProperty(value = "校区ID")
     private Long campusId;
 
     /**
@@ -106,7 +103,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 宿舍区域ID
      */
-    @ExcelProperty(value = "宿舍区域ID")
+    // @ExcelProperty(value = "宿舍区域ID")
     private Long areaId;
 
     /**
@@ -118,7 +115,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 宿舍楼ID
      */
-    @ExcelProperty(value = "宿舍楼ID")
+    // @ExcelProperty(value = "宿舍楼ID")
     private Long buildingId;
 
     /**
@@ -130,7 +127,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 宿舍房间ID
      */
-    @ExcelProperty(value = "宿舍房间ID")
+    // @ExcelProperty(value = "宿舍房间ID")
     private Long roomId;
 
     /**
@@ -142,7 +139,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 床位ID
      */
-    @ExcelProperty(value = "床位ID")
+    // @ExcelProperty(value = "床位ID")
     private Long bedId;
 
     /**
@@ -161,7 +158,7 @@ public class XgDormViolationVo implements Serializable {
     /**
      * 违纪等级：1轻微 2一般 3严重 4特别严重
      */
-    @ExcelProperty(value = "违纪等级：1轻微 2一般 3严重 4特别严重", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "违纪等级", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "dorm_violation_level")
     private String violationLevel;
 
@@ -181,21 +178,18 @@ public class XgDormViolationVo implements Serializable {
      * 涉及其他学生id（逗号分隔）
      */
     @ExcelProperty(value = "涉及其他学生id", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逗=号分隔")
     private String involvedStudents;
 
     /**
      * 附件OSS ID列表（逗号分隔）
      */
-    @ExcelProperty(value = "附件OSS ID列表", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逗=号分隔")
+    // @ExcelProperty(value = "附件OSS ID列表", converter = ExcelDictConvert.class)
     private String attachmentOssIds;
 
     /**
      * 删除标志（0代表存在 1代表删除）
      */
-    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除")
+    // @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
     private String deleted;
 
     /**
@@ -204,5 +198,4 @@ public class XgDormViolationVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
 }