From 3bf508c26ca8e8837197e358f5b4802d3ca59844 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 08 一月 2024 16:26:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java |   18 ++----------------
 1 files changed, 2 insertions(+), 16 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 1b68212..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
@@ -29,22 +29,8 @@
     /**鍛樺伐鍚嶇О*/
     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