From 25fd361007a843306bb4a1f4a5204ef9243fb974 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 19:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index f24306a..3b870e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -5,6 +5,8 @@
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,7 +27,7 @@
@Schema(title = "ID")
@ExcelProperty("ID")
@ColumnWidth(10)
- private Long id;
+ private String id;
@Schema(title = "鎺у埗鍣ㄥ湴鍧�")
@ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
@@ -48,4 +50,9 @@
@ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
@ColumnWidth(30)
private Date findDt;
+
+ @Schema(title = "鍦ㄧ嚎鐘舵��")
+ @ExcelProperty("鍦ㄧ嚎鐘舵��")
+ @ColumnWidth(6)
+ private String onlineState;
}
--
Gitblit v1.8.0