业务组接口，我的客户接口，公海接口，其他接口

src/main/java/cn/timer/api/bean/crm/CrmBusinessGroup.java

@@ -8,6 +8,8 @@
 package cn.timer.api.bean.crm;
 package cn.timer.api.bean.crm;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
@@ -60,12 +62,6 @@ public class CrmBusinessGroup extends Model<CrmBusinessGroup> {
 	@ApiModelProperty(value = "业务组名称")
 	@ApiModelProperty(value = "业务组名称")
 	private String name;
 	private String name;
 
 
-	@ApiModelProperty(value = "业务组管理员empNum")
-	private Integer manager;
-
-	@ApiModelProperty(value = "业务组管理员名称")
-	private String managerName;
-
 	@ApiModelProperty(value = "创建时间")
 	@ApiModelProperty(value = "创建时间")
 	@TableField(fill = FieldFill.INSERT)
 	@TableField(fill = FieldFill.INSERT)
 	private Date createTime;
 	private Date createTime;
@@ -85,8 +81,18 @@ public class CrmBusinessGroup extends Model<CrmBusinessGroup> {
 
 
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
+	@ApiModelProperty(value = "组管理员信息")
+	private List<Map<String, Object>> managers;
+	
+	@Transient
+	@TableField(exist = false)
+	@ApiModelProperty(value = "组管理员id")
+	private Integer[] managerIds;
+
+	@Transient
+	@TableField(exist = false)
 	@ApiModelProperty(value = "组成员id")
 	@ApiModelProperty(value = "组成员id")
-	private Integer[] ids;
+	private Integer[] memberIds;
 
 
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
@@ -98,4 +104,10 @@ public class CrmBusinessGroup extends Model<CrmBusinessGroup> {
 //
 //
 //	@ApiModelProperty(value = "组成员姓名")
 //	@ApiModelProperty(value = "组成员姓名")
 //	private String memberName;
 //	private String memberName;
+
+//	@ApiModelProperty(value = "业务组管理员empNum")
+//	private Integer manager;
+//
+//	@ApiModelProperty(value = "业务组管理员名称")
+//	private String managerName;
 }
 }

src/main/java/cn/timer/api/bean/crm/CrmBusinessGroupManager.java

+/**  
+* Title: CrmBusinessManager.java 
+* Description: 
+* @author dsc  
+* @date 2020年6月9日  
+* @version 1.0  
+*/
+package cn.timer.api.bean.crm;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Title: CrmBusinessGroupManager.java
+ * 
+ * @Description:
+ * @author dsc
+ * @date 2020年6月9日
+ * @version 1.0
+ */
+
+@Entity
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "crm_business_group_manager")
+@ApiModel("业务组管理员表")
+public class CrmBusinessGroupManager extends Model<CrmBusinessGroupManager> {
+
+	private static final long serialVersionUID = -957497237692110042L;
+
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "编号")
+	private Integer id;
+
+	@ApiModelProperty(value = "组id")
+	private Integer gid;
+
+	@ApiModelProperty(value = "员工id")
+	private Integer empNum;
+	
+	@ApiModelProperty(value = "企业id")
+	private Integer orgCode;
+}

src/main/java/cn/timer/api/bean/crm/CrmBusinessGroupMember.java

@@ -53,4 +53,7 @@ public class CrmBusinessGroupMember extends Model<CrmBusinessGroupMember>{
 	
 	
 	@ApiModelProperty(value = "员工id")
 	@ApiModelProperty(value = "员工id")
 	private Integer empNum;
 	private Integer empNum;
+	
+	@ApiModelProperty(value = "企业id")
+	private Integer orgCode;
 }
 }

src/main/java/cn/timer/api/bean/crm/CrmClientData.java

@@ -108,7 +108,7 @@ public class CrmClientData extends Model<CrmClientData> {
 	@ApiModelProperty(value = "备注")
 	@ApiModelProperty(value = "备注")
 	private String remarks;
 	private String remarks;
 
 
-	@ApiModelProperty(value = "客户所属(创建人empNum)")
+	@ApiModelProperty(value = "客户所属(创建人empNum) 0-进入客户公海")
 	private Integer belongUser;
 	private Integer belongUser;
 
 
 	@ApiModelProperty(value = "客户所属人姓名")
 	@ApiModelProperty(value = "客户所属人姓名")

src/main/java/cn/timer/api/dao/crm/CrmBusinessGroupManagerMapper.java

+/**  
+* Title: CrmBusinessGroupManagerMapper.java 
+* Description: 
+* @author dsc  
+* @date 2020年6月9日  
+* @version 1.0  
+*/
+package cn.timer.api.dao.crm;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.crm.CrmBusinessGroupManager;
+
+/**
+ * Title: CrmBusinessGroupManagerMapper.java
+ * 
+ * @Description:
+ * @author dsc
+ * @date 2020年6月9日
+ * @version 1.0
+ */
+public interface CrmBusinessGroupManagerMapper extends BaseMapper<CrmBusinessGroupManager> {
+
+}