From d9f331e175611a68f00a50cab63ea35442a4b0e6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 09:29:34 +0800
Subject: [PATCH] bug修改

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java |   15 ++++++++++++++-
 1 files changed, 14 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 4414b6b..e73d1ef 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;
     /**
      * 赛事名称
      */
@@ -81,6 +81,7 @@
      * 报名结束时间
      */
     @TableField("registerEndTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date registerEndTime;
     /**
      * 报名条件(1=全部用户,2=仅限年度会员参与,3=仅限学员参与)
@@ -226,10 +227,22 @@
      * 添加时间
      */
     @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date insertTime;
 
     @TableField(exist = false)
     private String storeName;
+    @TableField(exist = false)
+    private String sTime;
+    @TableField(exist = false)
+    private String eTime;
+    @TableField(exist = false)
+    private String rEndTime;
+    /**
+     * 运营商ID
+     */
+    @TableField("operatorId")
+    private Integer operatorId;
 
 
     @Override

--
Gitblit v1.7.1