From 2e9ac6878d3d7a59c200be7d74811c89dadf3a44 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 06 一月 2024 10:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
index 2a1cf2d..76fe8c1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
@@ -23,6 +23,39 @@
@Schema(title = "ID")
private Long id;
+ @Schema(title = "鍘縄D")
+ private String countyId;
+ @Schema(title = "鍘垮悕绉�")
+ private String countryName;
+
+ @Schema(title = "闀嘔D")
+ private String townId;
+ @Schema(title = "闀囧悕绉�")
+ private String townName;
+
+ @Schema(title = "鏉慖D")
+ private String villageId;
+ @Schema(title = "鏉戝悕绉�")
+ private String villageName;
+
+ @Schema(title = "鐗囧尯ID")
+ private String blockId;
+ @Schema(title = "鐗囧尯鍚嶇О")
+ private String bolckName;
+
+ @Schema(title = "鍒嗘按鎴縄D")
+ private String divideId;
+ @Schema(title = "鍒嗘按鎴垮悕绉�")
+ private String divideName;
+
+ @Schema(title = "鐢ㄦ埛绫诲瀷ID")
+ private String waterTypeId;
+ @Schema(title = "鐢ㄦ埛绫诲瀷鍚嶇О")
+ private String waterTypeName;
+
+ @Schema(title = "鍐滄埛ID")
+ private String clientId;
+
@Schema(title = "鍐滄埛濮撳悕")
private String name;
@@ -33,7 +66,10 @@
private String phone;
@Schema(title = "韬唤璇佸彿")
- private String idCard;
+ private String idcard;
+
+ @Schema(title = "绉嶆闈㈢Н")
+ private Double area;
@Schema(title = "鍗＄墖鏁伴噺")
private Integer cardCount;
@@ -41,10 +77,11 @@
@Schema(title = "鍦板潃")
private String address;
+ @Schema(title = "澶囨敞")
+ private String remarks;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "娉ㄥ唽鏃堕棿")
private Date operateDt;
-
-
}
--
Gitblit v1.8.0