From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
index 792124a..5fa2ea2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
@@ -19,42 +19,42 @@
* @date 2023/09/27 18:06
*/
@Data
-@ApiModel("璐﹀崟瀵煎叆鏄庣粏")
+@ApiModel("璐﹀崟瀵煎嚭鏄庣粏")
public class GoodsorderExportVO {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="璁㈠崟缂栧彿",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private String id;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
// @ExcelColumn(name="璁㈠崟缂栫爜")
private String code;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛",width = 10,align = HorizontalAlignment.CENTER)
- private String openid;
+ @ExcelColumn(name="鐢ㄦ埛",width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ private String memberOpenid;
@ApiModelProperty(value = "浜ゆ槗閲戦")
- @ExcelColumn(name="鏀粯閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏀粯閲戦",width = 10,index = 3,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@ApiModelProperty(value = "鏀粯鏃堕棿")
- @ExcelColumn(name="鏀粯鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏀粯鏃堕棿",width = 10,index = 4,align = HorizontalAlignment.CENTER)
private Date payDate;
@ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
- @ExcelColumn(name="缁撶畻閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="缁撶畻閲戦",width = 10,index = 5,align = HorizontalAlignment.CENTER)
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- @ExcelColumn(name="缁撶畻鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="缁撶畻鏃堕棿",width = 10,index = 6,align = HorizontalAlignment.CENTER)
private Date closeDate;
@ApiModelProperty(value = "閫�娆鹃噾棰�(鍒嗭級")
- @ExcelColumn(name="閫�娆鹃噾棰�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="閫�娆鹃噾棰�",width = 10,index = 7,align = HorizontalAlignment.CENTER)
private BigDecimal refundMoney;
@ApiModelProperty(value = "閫�娆炬椂闂�")
- @ExcelColumn(name="閫�娆炬椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="閫�娆炬椂闂�",width = 10,index = 8,align = HorizontalAlignment.CENTER)
private Date refundDate;
}
--
Gitblit v1.9.3