From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 17 Jun 2020 17:34:01 +0800
Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量：宽高和生成缩略图的暂存目录（缩略图上传成功后会删除） 3.修改文件上传中心的上传代码，将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口（可返回缩略图地址） 5.修改登录后回去用户信息不完整bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 4ec743c..c5d895c 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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -36,27 +38,29 @@
/**
* 组织Id
*/
- @NotNull(message = "组织Id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 医院Id
*/
@NotNull(message = "医院Id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long hospitalId;
/**
* 负责的销售代表
*/
- @NotNull(message = "负责的销售代表不能为空")
+ @NotNull(message = "服务代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long serverUserId;
/**
* 销售代表的名字
*/
- @NotEmpty(message = "销售代表的名字不能为空")
+ @NotEmpty(message = "服务代表的名字不能为空")
private String serverUserName;
/**
- * 科室/部门简介
+ * 销售代表电话
*/
- private String departmentAbout;
+ private String serverUserTel;
/**
* 状态，1启用，0停用
*/
@@ -66,4 +70,20 @@
*/
@TableLogic
private Boolean isDel;
+
+ /**
+ * 负责的销售代表
+ */
+ @NotNull(message = "负责的销售代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long saleUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String saleUserName;
+ /**
+ * 销售代表电话
+ */
+ private String saleUserTel;
}
--
Gitblit v1.8.0