From 7808456a1e50af2dbd67488278eac85a558bd8f9 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期日, 08 十月 2023 17:05:36 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java index a3b316c..01c561a 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java @@ -59,7 +59,7 @@ * 门店id */ @TableField("storeId") - private Integer storeId; + private String storeId; /** * 赛事名称 */ @@ -227,6 +227,7 @@ * 添加时间 */ @TableField("insertTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date insertTime; @TableField(exist = false) -- Gitblit v1.7.1