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/rider/domain/vo/OrderRiderOperationVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderRiderOperationVo.java b/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderRiderOperationVo.java
index e766bce..a6861f1 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderRiderOperationVo.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderRiderOperationVo.java
@@ -25,7 +25,7 @@
     @ApiModelProperty(value = "订单号")
     private String orderNum;
 
-    @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-上报已取商品")
+    @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-取货配送")
     private String operationType;
 
 }

--
Gitblit v1.9.3