From 2b6cd5a6e64e00b365707468d600085259d2f069 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 16:13:29 +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/voIr/VoUnit.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
index a6aaed0..197d597 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -21,13 +22,14 @@
public String projectName;
@Schema(description = "杞亴缁勭紪鐮�")
- private int groupCode;
+ private String groupCode;
@Schema(description = "鐏屾簤鍗曞厓ID")
private String unitId;
@Schema(description = "鐏屾簤闈㈢Н")
- private Integer area;
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double area;
@Schema(description = "澶囨敞")
private String remarks;
@@ -49,4 +51,10 @@
*/
@Schema(description = "鎿嶄綔鏃堕棿")
private Date operateDt;
+
+ @Schema(description = "鍙栨按鍙d")
+ public String intakeId;
+
+ @Schema(description = "鍙栨按鍙ｅ悕绉�")
+ public String intakeName;
}
--
Gitblit v1.8.0