From f5f444c2bbb1e1e90a6ea6d0fbbfa06c07deed2d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:47:24 +0800
Subject: [PATCH] 修改h端添加用户不能登录的问题
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 efa6b8c..98451e7 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,18 +1,16 @@
package com.kidgrow.usercenter.model;
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
+import org.hibernate.validator.constraints.NotEmpty;
-import java.util.Date;
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -39,24 +37,52 @@
/**
* 组织Id
*/
- @NotEmpty(message = "组织Id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 负责的销售代表
*/
- @NotEmpty(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停用
*/
private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 负责的销售代表
+ */
+ @NotNull(message = "负责的销售代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long saleUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String saleUserName;
+ /**
+ * 销售代表电话
+ */
+ private String saleUserTel;
+ /**
+ * 帐号数量,默认6
+ */
+ private Integer accountsCount;
+ /**
+ * 是否单次支付 1是0否
+ */
+ private Boolean isPay;
}
--
Gitblit v1.8.0