From a03f27c5edaab17263891dd2bc1e4e70fb96096c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 10 二月 2026 10:25:56 +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/business/model/GoodsorderDetail.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
index d1db85a..4284eac 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "璁㈠崟缂栫爜锛堝叧鑱攇oodsorder琛級", example = "1")
@ExcelColumn(name="璁㈠崟缂栫爜锛堝叧鑱攇oodsorder琛級")
private Integer orderId;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜锛坓ooods琛級", example = "1")
+ @ExcelColumn(name="鍟嗗搧缂栫爜锛坓ooods琛級")
+ private Integer goodsId;
@ApiModelProperty(value = "SKU鍒楄〃鍥�")
@ExcelColumn(name="SKU鍒楄〃鍥�")
@@ -102,11 +105,10 @@
private BigDecimal shopSettlement;
-
-
@ApiModelProperty(value = "鍟嗗搧鏍囩鍚嶇О")
@TableField(exist = false)
private String lablesName;
+
@ApiModelProperty(value = "鍟嗗搧涓诲浘")
@@ -121,5 +123,11 @@
@ApiModelProperty(value = "鐖剁被鍚嶇О")
@TableField(exist = false)
private String parentName;
+ @ApiModelProperty(value = "缁熻閲�")
+ @TableField(exist = false)
+ private BigDecimal totalNum;
+ @ApiModelProperty(value = "灏忚")
+ @TableField(exist = false)
+ private BigDecimal totalPrice;
}
--
Gitblit v1.9.3