From 4bd9195ff5beeb416792b50bbaea84c56a1b500b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 30 五月 2024 11:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
index 1912fd3..f6c7423 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
@@ -33,6 +33,25 @@
     @ApiModelProperty(value = "最多参与人数")
     @TableField(value = "participateCount")
     private Integer participateCount;
+    @ApiModelProperty(value = "状态 1=已开启 2=未开启 3=已结束 4=暂停")
+    @TableField(value = "state")
+    private Integer state;
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    @ApiModelProperty(value = "添加时间")
+    @TableField(value = "insertTime")
+    private Date insertTime;
+
+    @ApiModelProperty(value = "二维码链接")
+    @TableField(value = "qrCode")
+    private String qrCode;
 
     @ApiModelProperty(value = "开始时间")
     @TableField(value = "startTime")
@@ -62,6 +81,20 @@
     @TableField(value = "isDelete")
     private Integer isDelete;
 
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
     public Integer getId() {
         return id;
     }

--
Gitblit v1.7.1