From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java
index 660598d..c5fd5df 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java
@@ -14,6 +14,8 @@
 public class OrderManagePageListVO {
     @ApiModelProperty("订单id")
     private Long id;
+    @ApiModelProperty("订单idStr")
+    private String idStr;
     @ApiModelProperty("订单编号")
     @Excel(name = "订单编号")
     private String orderNumber;

--
Gitblit v1.7.1