From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji

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

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderRequest.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderRequest.java
index 15e7229..9d3401f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderRequest.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderRequest.java
@@ -11,14 +11,20 @@
  * @create 2023/3/23 9:50
  */
 @Data
-@ApiModel("鎴戠殑閿�鍞姤琛ㄨ姹傜被")
+@ApiModel("缁忛攢鍟嗚鍗曟煡璇�")
 public class ShopOrderRequest {
 
     @ApiModelProperty(value = "璁㈠崟鐘舵�侊細鐘舵�� 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣")
     private Integer status;
 
-    @ApiModelProperty(value = "缁忛攢鍟嗕富閿�")
+    @ApiModelProperty(value = "鏀惰揣绫诲瀷锛�0=蹇�掗厤閫侊紱1=闂ㄥ簵鑷彁锛�")
+    private Integer receiveType;
+
+    @ApiModelProperty(value = "缁忛攢鍟嗕富閿�",hidden = true)
     private Integer shopId;
 
+    @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鐢ㄦ埛绔紱1=缁忛攢鍟嗙")
+    private Integer userType;
+
 
 }

--
Gitblit v1.9.3