From bfedaf0182cac8fb947f1b0a3dee3d07c3c24f1e Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期五, 21 七月 2023 19:33:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java index 7d512f5..44334d2 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java @@ -1,5 +1,7 @@ package com.vci.ubcs.omd.vo; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.vci.ubcs.omd.entity.BtmTypeAttribute; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -161,5 +163,8 @@ /** * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS */ + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss.SSS" + ) private Date ts; } -- Gitblit v1.9.3