From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
index 39f45a2..d4bb85c 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
@@ -23,7 +23,7 @@
@ApiModelProperty(value = "璁㈠崟缂栧彿")
private String code;
- @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀛樺彇锛�1=寮傚湴瀛樺彇")
+ @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀵勫瓨锛�1=鍚屽煄瀵勯��")
private Integer type;
@ApiModelProperty(value = "灏卞湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;5=寰呭彇浠�;6=瀛樺湪閫炬湡;7=宸插畬鎴�;96:璁㈠崟鍏抽棴锛堥��娆撅級;97:鍙栨秷閫炬湡;98=鍙栨秷涓�;99=宸插彇娑�;" +
@@ -60,6 +60,9 @@
@ApiModelProperty(value = "瀛樹欢闂ㄥ簵鑱旂郴鐢佃瘽")
private String depositShopPhone;
+
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鍦板潃")
+ private String depositShopAddress;
// ---- 鍙栦欢淇℃伅 ----
@@ -131,4 +134,21 @@
@ApiModelProperty(value = "璇勪环鐘舵�侊細0=鏈瘎浠凤紱1=宸茶瘎浠�")
private Integer commentStatus;
+ @ApiModelProperty(value = "搴忓彿")
+ private String sortnum;
+ @ApiModelProperty(value = "鍙栬揣搴忓彿")
+ private String sortnumTake;
+
+
+ @ApiModelProperty(value = "涓嬪崟鐓х墖")
+ private List<String> orderImages;
+
+ @ApiModelProperty(value = "鍙紑绁ㄩ噾棰濓紙鍒嗭級= 鏀粯閲戦 - 閫�娆鹃噾棰�")
+ private Long invoiceAmount;
+
+ @ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰濓紙鍒嗭級")
+ private Long deductionAmount;
+
+ @ApiModelProperty(value = "鏄惁寮傚父璁㈠崟锛�0=鍚︼紱1=鏄�")
+ private Integer abnormalOrder;
}
--
Gitblit v1.9.3