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 --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java index 16b768d..e6727e0 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java @@ -1,6 +1,8 @@ package com.gkhy.safePlatform.equipment.model.dto.req; import java.sql.Timestamp; + +import com.fasterxml.jackson.annotation.JsonFormat; import com.gkhy.safePlatform.equipment.annotation.Query; public class EquipmentTestDetailQueryCriteria { @@ -18,6 +20,7 @@ private Long testPersonId; //检测日期 @Query() + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp testDate; //检测人单位/外键 @Query() @@ -33,9 +36,11 @@ private String testStatus; //创建日期 @Query() + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp createTime; //更新日期 @Query() + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp updateTime; -- Gitblit v1.9.2