From 0ef46975993c06e780ec4981d7535167673aa51d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 10:39:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
index dbefc91..f2fcc60 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
@@ -40,6 +40,7 @@
private String userName;
private Long appUserId;
+ private Integer shopId;
/**
* 联系方式
@@ -53,6 +54,11 @@
*/
@Excel(name = "商品名称")
private String goodsName;
+ /**
+ * 商品名称
+ */
+ @Excel(name = "店铺名称")
+ private String shopName;
/**
* 商品售价
--
Gitblit v1.7.1