From 86750e61ea9a777263b35588331192eeec7b24e4 Mon Sep 17 00:00:00 2001
From: fxh <15076273430@163.com>
Date: Tue, 10 Jun 2025 15:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9order=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/wzj/soopin/order/controller/OrderController.java  | 2 +-
 .../order/controller/OrderDeliveryHistoryController.java       | 2 +-
 .../java/com/wzj/soopin/order/domain/entity/OrderItem.java     | 3 ++-
 .../src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java  | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java
index abf6162c0..75f0ed11c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java
@@ -57,7 +57,7 @@ public class OrderController extends BaseController {
 
 
 
-    @ApiOperation("查询订单售后列表")
+    @ApiOperation("查询订单列表")
     @PostMapping("/list")
     public R<Page<OrderVO>> list(@RequestBody OrderBo query, Page<Order> page) {
         Page<Order> list =  service.page(page,query.toWrapper() );
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
index 985b8a9f4..0797985a0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
@@ -52,7 +52,7 @@ public class OrderDeliveryHistoryController extends BaseController {
 //        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
 //    }
 
-    @ApiOperation("查询订单表列表")
+    @ApiOperation("查询订单发货列表")
     @PostMapping("/list")
     public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) {
         Page<OrderDeliveryHistory> list =  historyService.page(page,query.toWrapper() );
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java
index d0102dbfd..e6726d3c5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java
@@ -24,7 +24,8 @@ public class OrderItem extends BaseAudit {
     @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
-
+    @Excel(name = "商家备注")
+    private String merchantNote;
     @ApiModelProperty("订单id")
     @Excel(name = "订单id")
     private Long orderId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
index 63d70b516..31e3320e3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
@@ -31,6 +31,7 @@ public class OrderVO extends BaseAudit {
    /** 用户帐号 */
     @Excel(name = "用户帐号")
     private String memberUsername;
+
     /** 商家备注 */
     @Excel(name = "商家备注")
     private String merchantNote;