From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
index bd4ceb6..83e33e2 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
@@ -64,7 +64,7 @@
private String crkmxid; //鍑哄叆搴撴槑缁咺D
private String ajbh; //寤掗棿缂栧彿
- private String cfmc; //寤掗棿鍚嶇О
+ private String ajmc ; //寤掗棿鍚嶇О
private String hwbh; //璐т綅缂栧彿
private String hwmc; //璐т綅鍚嶇О
private String kctzbh; //搴撳瓨鍙板笎ID
@@ -93,7 +93,7 @@
private String qkxm; //娆犳椤圭洰
private Double dj; //鍗曚环
private Double je; //閲戦
- private String dj1; //绛夌骇
+ private String cpdj ; //绛夌骇
private String cd; //浜у湴
private String sccj; //鐢熶骇鍘傚
private String gg; //瑙勬牸鍨嬪彿
@@ -105,11 +105,17 @@
private String bzqjzrq; //淇濊川鏈熸埅鑷虫棩鏈�
private String bgy; //淇濈鍛�
private String ckfs; //鍑哄簱鏂瑰紡
- private String djsj; //鐧昏鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date djsj; //鐧昏鏃堕棿
private String zz; //绔欓暱
private String jjy; //璐ㄦ鍛�
- private String sxh; //椤哄簭鍙�
-// private String bz; //澶囨敞
+ private int sxh; //椤哄簭鍙�
+ // private String bz; //澶囨敞
+ private String ddid; //璁㈠崟ID
+ private String crktzdid; //鍑哄叆搴撻�氱煡鍗旾D
+ private String crktzdmxid; //鍑哄叆搴撻�氱煡鍗曟槑缁咺D
+ private String djr; //鐧昏浜�
+
private String jybgwjid; //妫�楠屾姤鍛婃枃浠秈d
@JSONField(format = "yyyy-MM-dd")
--
Gitblit v1.9.3