From 4b2c48677c2b5de7f89ff0d018a55b7916467b27 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 22 四月 2025 17:29:41 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderReasinDto.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderReasinDto.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderReasinDto.java index bc3a23d..3397519 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderReasinDto.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderReasinDto.java @@ -2,9 +2,11 @@ import lombok.Data; +import java.util.Date; import java.util.List; @Data public class OrderReasinDto { Integer workerId; List<ReassinDto> reassinDtos; -} + String reason; + String arriveTime;} -- Gitblit v1.7.1