From df4c32cf8120816790ea89157094849003876827 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 13 十月 2023 14:59:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
index 1bc12c3..388c3ca 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java
@@ -59,7 +59,7 @@
      * 门店id
      */
     @TableField("storeId")
-    private Integer storeId;
+    private String storeId;
     /**
      * 赛事名称
      */
@@ -227,8 +227,13 @@
      * 添加时间
      */
     @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date insertTime;
-
+    /**
+     * 运营商ID
+     */
+    @TableField("operatorId")
+    private Integer operatorId;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1