From 086be7eae50e48ad554fd8a3f4cb1e333d587595 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 27 一月 2026 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 cc066a4..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鍒楄〃鍥�")

--
Gitblit v1.9.3