From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java
index 6954c38..9ab2647 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java
@@ -23,7 +23,7 @@
     @ApiModelProperty(value = "璁㈠崟绫诲瀷 0骞冲彴鍟嗗煄 1鍜栬眴鍟嗗煄", example = "1")
     private Integer orderType;
 
-    @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚", example = "1")
+    @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1寰呭彂璐�/鑷彁 2寰呮敹璐� 3浜ゆ槗瀹屾垚", example = "1")
     private Integer orderStatus;
 
 }

--
Gitblit v1.9.3