From 09323e7895ae85319cd8afc51409be43cde90e3d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 18 Nov 2025 15:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/domain/dto/BoxHistoryDTO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/domain/dto/BoxHistoryDTO.java b/ard-work/src/main/java/com/ard/work/domain/dto/BoxHistoryDTO.java
index ecbd858..d58e025 100644
--- a/ard-work/src/main/java/com/ard/work/domain/dto/BoxHistoryDTO.java
+++ b/ard-work/src/main/java/com/ard/work/domain/dto/BoxHistoryDTO.java
@@ -1,11 +1,14 @@
 package com.ard.work.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @Builder
 @AllArgsConstructor

--
Gitblit v1.9.3