From 06dd11c6f8c314200a9d4bee13f78ed984cd244e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 20 Jul 2020 09:18:12 +0800
Subject: [PATCH] 修改医院/医生部分已知问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
index 31a2cd8..59a2ab5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
@@ -2,6 +2,9 @@
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,14 +28,20 @@
     /**
      * 对应product_order_detail表中的id
      */
+
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /**
      * 对应product_order表中的id
      */
+
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
     /**
      * 产品/明细ID
      */
+
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long proId;
     /**
      * 产品类型
@@ -43,9 +52,19 @@
      */
     private String proName;
     /**
+     * 医院id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long hospitalId;
+    /**
      * 医院名称
      */
     private String hospitalName;
+    /**
+     * 科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long departmentId;
     /**
      * 科室名称
      */
@@ -65,14 +84,17 @@
     /**
      * 有效的开始时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date proBegintime;
     /**
      * 有效的结束时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date proEndtime;
     /**
      *创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
      * 是否删除,1删除,0未删除

--
Gitblit v1.8.0