From faf02e3bad9fe25c60acf9a8be7e58122a4cec4a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 05 八月 2024 15:01:20 +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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 cdc8a43..1042061 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;
@@ -20,12 +22,12 @@
@Data
@Schema(title = "鎺у埗鍣ㄨ鍥惧璞�")
public class VoController implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704003L;
@Schema(title = "ID")
@ExcelProperty("ID")
@ColumnWidth(10)
- private Long id;
+ private String id;
@Schema(title = "鎺у埗鍣ㄥ湴鍧�")
@ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
@@ -48,4 +50,25 @@
@ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
@ColumnWidth(30)
private Date findDt;
+
+// @Schema(title = "鍦ㄧ嚎鐘舵��")
+// @ExcelProperty("鍦ㄧ嚎鐘舵��")
+// @ColumnWidth(6)
+// private String onlineState;
+
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
+ private Boolean isOnLine;
+
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelProperty("閫氳鍗忚")
+ @ColumnWidth(10)
+ private String protocol;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(10)
+ private String remarks;
}
--
Gitblit v1.8.0