From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 12 八月 2022 16:59:06 +0800 Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java index a42d29f..5dac4a3 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java @@ -3,16 +3,30 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class EmergencySuppliesReqDTO { - @TableId(type = IdType.AUTO) + private String principalUserName; + + public String getPrincipalUserName() { + return principalUserName; + } + + public void setPrincipalUserName(String principalUserName) { + this.principalUserName = principalUserName; + } + private Long id; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date productionDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date useDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date inspectDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date nextInspectDate; private Integer inspectPeriod; private Integer count; -- Gitblit v1.9.2