From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
index 2d57589..028d5cf 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
@@ -1,5 +1,6 @@
 package com.oying.modules.sh.domain.vo;
 
+import com.oying.modules.pc.store.domain.Store;
 import com.oying.modules.sh.domain.UserAddress;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -17,6 +18,8 @@
 @Setter
 public class OrderInfo {
 
+    @ApiModelProperty(value = "门店信息")
+    private Store store;
     @ApiModelProperty(value = "商品信息列")
     private List<ProductInfo> products;
     @ApiModelProperty(value = "用户地址信息")

--
Gitblit v1.9.3