From 1df2ad6224fa4bd1ca38d235d5e4b917262added Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 19 Feb 2021 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index 47063e7..5480135 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.model;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
@@ -94,9 +95,22 @@
/**
* 运动处方服务生效时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date healthBeginTime;
/**
* 运动处方服务结束时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date healthEndTime;
+
+ /**
+ * 部门联系人
+ */
+ private String departmentLink;
+
+ /**
+ * 部门联系人
+ */
+ private String departmentTel;
+
}
--
Gitblit v1.8.0