Merge branch 'lal' into 'develop'

提交客户

See merge request 8timerv2/8timerapiv200!459

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

@@ -156,6 +156,12 @@ public class CrmClientData extends Model<CrmClientData> {
 	@ApiModelProperty(value = "企业id")
 	@ApiModelProperty(value = "企业id")
 	private Integer orgCode;
 	private Integer orgCode;
 	
 	
+	@ApiModelProperty(value = "微信")
+	private String wechat;
+	
+	@ApiModelProperty(value = "产品")
+	private String product;
+
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
 	@ApiModelProperty(value = "协作人id")
 	@ApiModelProperty(value = "协作人id")

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -1378,6 +1378,8 @@ public class CrmController {
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("行业", "industryName");
 		reader.addHeaderAlias("行业", "industryName");
+		reader.addHeaderAlias("微信", "wechat");
+		reader.addHeaderAlias("产品", "product");
 		reader.addHeaderAlias("客户类型", "clientTypeName");
 		reader.addHeaderAlias("客户类型", "clientTypeName");
 		reader.addHeaderAlias("手机号码(客户)", "clientCellphone");
 		reader.addHeaderAlias("手机号码(客户)", "clientCellphone");
 		reader.addHeaderAlias("座机号码", "clientTelephone");
 		reader.addHeaderAlias("座机号码", "clientTelephone");
@@ -1405,6 +1407,10 @@ public class CrmController {
 			String clientEmail = crmClientDataImportVo.getClientEmail(); // 邮箱
 			String clientEmail = crmClientDataImportVo.getClientEmail(); // 邮箱
 			String clientAddress = crmClientDataImportVo.getAddress(); // 地址
 			String clientAddress = crmClientDataImportVo.getAddress(); // 地址
 			
 			
+			String wechat = crmClientDataImportVo.getWechat(); // 微信
+			String product = crmClientDataImportVo.getProduct(); // 产品
+			
+
 			String linkname = crmClientDataImportVo.getLinkName(); // 联系人姓名
 			String linkname = crmClientDataImportVo.getLinkName(); // 联系人姓名
 			String linkcellphone = crmClientDataImportVo.getCellphone(); // 手机号码
 			String linkcellphone = crmClientDataImportVo.getCellphone(); // 手机号码
 			String linkcompany = crmClientDataImportVo.getCompany(); // 所属公司
 			String linkcompany = crmClientDataImportVo.getCompany(); // 所属公司
@@ -1452,6 +1458,9 @@ public class CrmController {
 			crmClientData.setBelongGroup(crmBusinessGroup.getId());
 			crmClientData.setBelongGroup(crmBusinessGroup.getId());
 			crmClientData.setIndustryName(industryName);
 			crmClientData.setIndustryName(industryName);
 			
 			
+			crmClientData.setWechat(wechat);
+			crmClientData.setProduct(product);
+
 			crmClientData.setClientTypeName(clientTypeName);
 			crmClientData.setClientTypeName(clientTypeName);
 
 
 			crmClientData.setClientCellphone(clientCellphone);
 			crmClientData.setClientCellphone(clientCellphone);

src/main/java/cn/timer/api/dto/crm/CrmClientDataImportVo.java

@@ -9,6 +9,7 @@ package cn.timer.api.dto.crm;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -48,6 +49,12 @@ public class CrmClientDataImportVo implements Serializable {
 	// 详细地址
 	// 详细地址
 	private String address;
 	private String address;
 
 
+	//微信
+	private String wechat;
+	
+	//产品
+	private String product;
+	
 	// 联系人信息
 	// 联系人信息
 	private String linkName;
 	private String linkName;
 	private String cellphone;
 	private String cellphone;