From bdf04af3958fb7a61f3180aa1efb795ba8ac00d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:28:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java |    6 ++++++
 1 files changed, 6 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 8611e2f..089802f 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
@@ -156,9 +156,15 @@
     /**
      * 鏁忔劅淇℃伅
      */
+
     private String consigneeName;
     private String consigneeMobile;
 
+
+    private String memberId;
+    @Setter
+    private String nickName;
+
     public List<OrderItemVO> getOrderItems() {
         if (CharSequenceUtil.isEmpty(groupGoodsId)) {
             return new ArrayList<>();

--
Gitblit v1.8.0