From 11ff07252c6e6ed90e810cd9e5d033e7c7438a45 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 28 十月 2023 17:11:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java | 2 +-
1 files changed, 1 insertions(+), 1 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 12f64b8..699add8 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
@@ -46,7 +46,7 @@
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- @ExcelColumn(name="缁撶畻鏃堕棿",width = 10,index = 6,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
+// @ExcelColumn(name="缁撶畻鏃堕棿",width = 10,index = 6,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date closeDate;
@ApiModelProperty(value = "閫�娆鹃噾棰�(鍒嗭級")
--
Gitblit v1.9.3