From 113850144f0ff9358fd278c9077ff3396bcb4c38 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 七月 2024 14:56:33 +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 |   10 ++++++++--
 1 files changed, 8 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..0d82a29 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
@@ -21,13 +21,13 @@
     public String projectName;
 
     @Schema(description = "杞亴缁勭紪鐮�")
-    private int groupCode;
+    private String groupCode;
 
     @Schema(description = "鐏屾簤鍗曞厓ID")
     private String unitId;
 
     @Schema(description = "鐏屾簤闈㈢Н")
-    private Integer area;
+    private Double area;
 
     @Schema(description = "澶囨敞")
     private String remarks;
@@ -49,4 +49,10 @@
      */
     @Schema(description = "鎿嶄綔鏃堕棿")
     private Date operateDt;
+
+    @Schema(description = "鍙栨按鍙d")
+    public String intakeId;
+
+    @Schema(description = "鍙栨按鍙e悕绉�")
+    public String intakeName;
 }

--
Gitblit v1.8.0