From db2412261a825653ca9eccc1fca0569f6745f1d7 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 21 Aug 2020 19:57:47 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
index 5582b2f..cf320f8 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
@@ -1,19 +1,13 @@
package com.kidgrow.common.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 lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
+import org.hibernate.validator.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -59,22 +53,14 @@
*/
private String orgCode;
/**
- * 负责的销售id
- */
- private Long saleUserId;
- /**
- * 销售代表的名字
- */
- private String saleUserName;
- /**
- * 负责销售的联系方式
- */
- private String saleUserTel;
- /**
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
/**
+ * 是否删除，1删除，0未删除
+ */
+ private String createUserOrgCode;
+ /**
* 状态，1启用，0停用
*/
private Boolean enabled;
--
Gitblit v1.8.0