From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java
index bc75ad7..b9767f0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/TEnterpriseExport.java
@@ -27,8 +27,7 @@
private String phone;
@Excel(name = "备注",width = 30)
private String remark;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "申请时间",width = 30,exportFormat="yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "申请时间",width = 30)
private String createTime;
--
Gitblit v1.7.1