From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
index 9412cd1..5939097 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -6,6 +6,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
@@ -29,9 +30,9 @@
private String sbbh; //璁惧缂栧彿
private String sbmc; //璁惧鍚嶇О
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String wxkssj; //寮�濮嬬淮淇椂闂�
+ private Date wxkssj; //寮�濮嬬淮淇椂闂�
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String wxjssj; //缁撴潫缁翠慨鏃堕棿
+ private Date wxjssj; //缁撴潫缁翠慨鏃堕棿
private String wxdw; //缁翠慨鍗曚綅
private String lxr; //鑱旂郴浜�
private String lxdh; //鑱旂郴鐢佃瘽
@@ -44,12 +45,8 @@
private String wxfy; //缁翠慨璐圭敤
private String ysr; //楠屾敹浜�
private String jl; //缁撹
- private String wxjlzp; //缁存姢璁板綍鐓х墖
+ private List<WhjlWHJLZP> whjlzp; //缁存姢璁板綍鐓х墖
private String bz; //澶囨敞
- private String zpid; //鐓х墖id
- private String zpmc; //鐓х墖鍚嶇О
- private String zplj; //鐓х墖璺緞
- private int zpdx; //鐓х墖澶у皬
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
--
Gitblit v1.9.3