From 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 15 十月 2025 14:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
index affd624..9dc4e7f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
@@ -153,6 +153,20 @@
     @ApiModelProperty(value = "鍗栧璁㈠崟澶囨敞")
     private String sellerRemark;
 
+    /**
+     * 鏁忔劅淇℃伅
+     */
+
+    private String consigneeName;
+    private String consigneeMobile;
+    private String modifyAddressFlag;
+    private String customizeFlag;
+
+
+    private String memberId;
+    @Setter
+    private String nickName;
+
     public List<OrderItemVO> getOrderItems() {
         if (CharSequenceUtil.isEmpty(groupGoodsId)) {
             return new ArrayList<>();

--
Gitblit v1.8.0