From 0f22f66ae9d2156b983f533beb17a0062a949524 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 26 十月 2025 20:46:28 +0800
Subject: [PATCH] Merge branch 'master' into 1027-master
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 3b15a25..518cdf7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -648,13 +648,13 @@
private String patfrom;
/**
- * 鎮ｈ�呮潵婧�
+ * 缁忕鍖荤敓缂栫爜
*/
@ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
private String managementDoctorCode;
/**
- * 鎮ｈ�呮潵婧�
+ * 缁忕鍖荤敓
*/
@ApiModelProperty(value = "缁忕鍖荤敓")
private String managementDoctor;
@@ -681,6 +681,7 @@
* 缁撴潫鍑洪櫌鏃ユ湡
*/
@ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endOutHospTime;
/**
--
Gitblit v1.9.3