From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java
index c5a374e..4e5126d 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java
@@ -5,6 +5,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 @ApiModel("蹇楅偊CRM瀹㈡埛鐣欒祫鎻愪氦鍙傛暟")
@@ -17,9 +18,9 @@
     private String phone;
     @ApiModelProperty(value = "璁捐甯堟墜鏈哄彿")
     private String shopper;
-    @ApiModelProperty(value = "鏉ユ簮")
+    @ApiModelProperty(value = "鏉ユ簮 MP01銆愰浂鍏冭璁°�戙�丮P02銆愭姤浠疯绠楀櫒銆�")
     private String source;
-    @ApiModelProperty(value = "娓犻亾")
+    @ApiModelProperty(value = "娓犻亾MP0100 锛孧P0200 ")
     private String channel;
     @ApiModelProperty(value = "鏃ユ湡 yyyy/MM/dd HH:mm")
     private String date;
@@ -39,6 +40,6 @@
     private String openid;
     @ApiModelProperty(value = "缁堢淇℃伅")
     private String terminal;
-    @ApiModelProperty(value = "鏉ユ簮绫诲瀷  3绗笁鏂瑰钩鍙�  12 灏忕▼搴�)")
-    private String lyType;
+    @ApiModelProperty(value = "瀵艰喘淇℃伅鍒楄〃")
+    private List<CrmCustomerUsernameRequest> userData;
 }
\ No newline at end of file

--
Gitblit v1.9.3