From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

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

diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
index 1912fd3..8c8f5e8 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,12 +20,14 @@
  * @since 2020-06-09
  */
 @TableName("t_activity_generalization")
+@Data
 public class TActivityGeneralization extends Model<TActivityGeneralization> {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    private Integer effective;
 
     @ApiModelProperty(value = "活动名称")
     @TableField(value = "activityName")
@@ -61,6 +64,7 @@
     @ApiModelProperty(value = "是否删除  1=否 2=是")
     @TableField(value = "isDelete")
     private Integer isDelete;
+    private Integer state;
 
     public Integer getId() {
         return id;

--
Gitblit v1.7.1