From d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:36:24 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
index 5ca79be..6f2061e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
@@ -1,13 +1,11 @@
package com.panzhihua.service_user.model.dos;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.models.auth.In;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -23,6 +21,7 @@
/**
* id
*/
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -61,7 +60,7 @@
private Date businessTime;
/**
- * 业务状态 1未通过、取消 2 成功
+ * 业务状态 1未通过、取消 2 成功
*/
private Integer businessStatus;
@@ -86,4 +85,8 @@
* 业务主键 用于跳转
*/
private Long businessId;
+ /**
+ * 社区活动类型 1志愿者活动 2居民活动
+ */
+ private Integer activityType;
}
--
Gitblit v1.7.1