From fc365c426e431a73d116e5d51deaec667f4864de Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 20 Oct 2025 17:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java | 20 +-------------------
1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
index e51a53a..f3757d7 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
@@ -1,11 +1,9 @@
package com.ard.route.domain;
-import java.util.Date;
import java.util.List;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@@ -26,22 +24,6 @@
@Excel(name = "文件夹名称")
private String fileName;
- /** 创建者 */
- @Excel(name = "创建者")
- private String createdBy;
-
- /** 创建时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createdTime;
-
- /** 修改者 */
- @Excel(name = "修改者")
- private String updatedBy;
-
- /** 修改时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updatedTime;
-
- private List<ArdRouteFile> ardRouteFile;
+ private List<ArdRouteFile> ardRouteFileLs;
}
--
Gitblit v1.9.3