From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/export/ContractExport.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/ContractExport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/ContractExport.java
index b5f25f7..ac9c72f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/ContractExport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/ContractExport.java
@@ -9,7 +9,7 @@
import java.util.Date;
@Data
-@ApiModel(value = "光缆巡检导出excel")
+@ApiModel(value = "合同导出excel")
public class ContractExport implements Serializable {
@Excel(name = "合同编号",width = 30)
@@ -24,15 +24,15 @@
@Excel(name = "乙方名称",width = 30)
private String partyTwoName;
- @Excel(name = "创建时间",width = 30,exportFormat = "yyyy-MM-dd")
- private LocalDateTime create_time;
+ @Excel(name = "创建时间",width = 30)
+ private String createTime;
- @Excel(name = "生效日期",width = 30,exportFormat = "yyyy-MM-dd")
- private LocalDateTime startTime;
+ @Excel(name = "生效日期",width = 30)
+ private String startTime;
- @Excel(name = "终止日期",width = 30,exportFormat = "yyyy-MM-dd")
- private LocalDateTime endTime;
+ @Excel(name = "终止日期",width = 30)
+ private String endTime;
@Excel(name = "租金支付方式",width = 30)
private String payType;
--
Gitblit v1.7.1