From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
index 74a4f1d..38b0835 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
@@ -1,15 +1,20 @@
 package com.dsh.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @TableName("t_store")
 @Data
 public class TStore {
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
+    @TableField("name")
     private String name;
     @TableField("storeStaffId")
     private Integer storeStaffId;
@@ -38,5 +43,12 @@
     private String welfarePicture;
     private BigDecimal score;
     private Integer state;
-
+    @TableField("operatorId")
+    private Integer operatorId;
+    @TableField("type")
+    private Integer type;
+    @TableField("ids")
+    private String ids;
+    @TableField("createTime")
+    private Date createTime;
 }

--
Gitblit v1.7.1