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 | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 c5d895c..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,7 +1,7 @@
package com.kidgrow.usercenter.model;
-import com.baomidou.mybatisplus.annotation.TableLogic;
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;
@@ -12,6 +12,7 @@
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -41,12 +42,6 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
- * 医院Id
- */
- @NotNull(message = "医院Id不能为空")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long hospitalId;
- /**
* 负责的销售代表
*/
@NotNull(message = "服务代表不能为空")
@@ -68,9 +63,7 @@
/**
* 是否删除，1删除，0未删除
*/
- @TableLogic
private Boolean isDel;
-
/**
* 负责的销售代表
*/
@@ -86,4 +79,38 @@
* 销售代表电话
*/
private String saleUserTel;
+ /**
+ * 帐号数量,默认6
+ */
+ private Integer accountsCount;
+ /**
+ * 是否单次支付 1是0否
+ */
+ private Boolean isPay;
+ /**
+ * 运动处方 1是0否
+ */
+ private Boolean isHealth;
+
+ /**
+ * 运动处方服务生效时间
+ */
+ @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