From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index ac62637..1d9befb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -69,6 +69,10 @@
@ExcelColumn(name="璁㈠崟瀹炰粯浠锋牸",index =9,width = 10)
private BigDecimal price;
+ @ApiModelProperty(value = "閭垂閲戦", example = "1")
+ private BigDecimal mailPrice;
+
+
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@TableField(exist = false)
@@ -129,7 +133,7 @@
@ApiModelProperty(value = "鏀粯鍗曞彿")
private String payOrderId;
- @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0鐜伴噾鏀粯 1绉垎鏀粯", example = "1")
private Integer payMethod;
@ApiModelProperty(value = "蹇�掑崟鍙�")
@@ -140,7 +144,6 @@
@ApiModelProperty(value = "蹇�掔紪鐮侊紙鍏宠仈labels琛級", example = "1")
private Integer kdId;
-
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
--
Gitblit v1.9.3