From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
index 6d1486c..ea8cd73 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
@@ -57,8 +57,7 @@
@ApiModelProperty(value = "婊￠锛堝厓锛�", example = "1")
private BigDecimal limitPrice;
- @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
- @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓銆佹姌锛�", example = "1")
private BigDecimal price;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -69,7 +68,7 @@
@ExcelColumn(name="缁撴潫鏃堕棿",width = 10 ,index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
- @ApiModelProperty(value = "棰嗗彇鏂瑰紡 0棰嗗彇 1鍏戞崲", example = "1")
+ @ApiModelProperty(value = "棰嗗彇鏂瑰紡 0=棣栨娉ㄥ唽;1=閭�璇峰ソ鍙�;2=瀹氬悜鍙戞斁;", example = "1")
@ExcelColumn(name="棰嗗彇鏂瑰紡",width = 10,index = 4,valueMapping = "0=棣栨娉ㄥ唽;1=閭�璇峰ソ鍙�;2=瀹氬悜鍙戞斁;")
private Integer getMethod;
@@ -128,5 +127,13 @@
@ApiModelProperty(value = "瀹為檯閫傜敤鏃堕噾棰�")
@TableField(exist = false)
private BigDecimal validAmount;
+ @ApiModelProperty(value = "鐢ㄦ埛鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
+ @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
+ @TableField(exist = false)
+ private BigDecimal couponPrice ;
}
--
Gitblit v1.9.3