From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
index 1580bef..e7a9ab1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
@@ -11,10 +11,10 @@
private Integer mzzdid;
private String sqysbm;
private String mzksbm;
- @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
- private Date fbrq;
- @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
- private Date zdrq;
+// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
+ private String fbrq;
+// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
+ private String zdrq;
private String czybm;
private String czyksbm;
private String zs;
@@ -37,4 +37,5 @@
private String sfqj;
@JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
private Date ckrq;
+ private Integer jzqk;
}
--
Gitblit v1.8.0