From aab9f74b97df038154d507b6d17b6f96a8337efc Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 03 七月 2025 13:46:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java index 1f5bf55..33de871 100644 --- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java +++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java @@ -1,11 +1,15 @@ package com.ruoyi.purchase.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.purchase.pojo.TicketRegistration; import com.ruoyi.sales.pojo.CommonFile; import com.ruoyi.sales.pojo.SalesLedgerProduct; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.util.List; /** @@ -46,6 +50,12 @@ */ private String businessPerson; + + + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate enterDate; + /** * 涓氬姟鍛榠d */ @@ -65,4 +75,9 @@ private List<CommonFile> CommonFiles; private String fileName; + + @TableField(exist = false) + private String createdAtStart; + @TableField(exist = false) + private String createdAtEnd; } -- Gitblit v1.9.3