From dc72b94ed88585df5d49a90a39f723cd0364bb6d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 24 四月 2024 18:07:15 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java
index 502db6f..91ce5a4 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java
@@ -24,29 +24,13 @@
/**璁㈠崟澶囨敞*/
private String remark;
- /**鍛樺伐瑙掕壊鏍囪瘑*/
- private String staffRoleId;
/**鍛樺伐鍚嶇О*/
private String staffId;
/**鍛樺伐鍚嶇О*/
private String staffName;
- /***********鏀朵欢************/
-
- /**鏀朵欢-鑱旂郴浜�*/
- private String linkMan;
- /**鏀朵欢-鑱旂郴鐢佃瘽*/
- private String linkTel;
- /**鏀朵欢-鍦板潃-鐪�*/
- private String province;
- /**鏀朵欢-鍦板潃-甯�*/
- private String city;
- /**鏀朵欢-鍦板潃-鍖�*/
- private String area;
- /**鏀朵欢-鍦板潃-琛楅亾*/
- private String street;
- /**鏀朵欢-鍦板潃-璇︾粏*/
- private String addrDetail;
+ /**鏀朵欢*/
+ private DeliveryAddressVo deliveryAddress;
/**鏀粯鏂瑰紡-绾夸笂*/
public static final int PAYMENT_METHOD_ONLINE = 1;
--
Gitblit v1.8.0