From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' 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