From 47818e4505abc4b6ec9fdbc03dd427d66db37514 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 22 Jul 2020 19:20:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/DiagnosisRecord.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/DiagnosisRecord.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/DiagnosisRecord.java
index abad609..1adbb32 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/DiagnosisRecord.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/DiagnosisRecord.java
@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.vo;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -26,7 +27,7 @@
/**
*诊断门诊名称
*/
- private String diagnostictDepartName;
+ private String diagnosticDepartName;
/**
*诊断医生名称
*/
@@ -52,11 +53,18 @@
*/
private String childPhone;
/**
+ * 诊断时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date diagnosticDiagnoseTime;
+ /**
* 诊断创建时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date createTime;
/**
* 诊断更新时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date updateTime;
}
--
Gitblit v1.8.0