From 94e23fd6ad010b560fe4cc566db38082d7619696 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 16:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java |    2 --
 1 files changed, 0 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..c954311 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
@@ -102,8 +102,6 @@
     private BigDecimal shopSettlement;
 
 
-
-
     @ApiModelProperty(value = "鍟嗗搧鏍囩鍚嶇О")
     @TableField(exist = false)
     private String lablesName;

--
Gitblit v1.9.3