From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +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 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 01767d6..30c81f7 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
@@ -61,6 +61,9 @@
@ApiModelProperty(value = "瀛樹欢闂ㄥ簵鑱旂郴鐢佃瘽")
private String depositShopPhone;
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鍦板潃")
+ private String depositShopAddress;
+
// ---- 鍙栦欢淇℃伅 ----
@ApiModelProperty(value = "鍙栦欢闂ㄥ簵涓婚敭锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
@@ -139,4 +142,13 @@
@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