From e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 18:06:14 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..a3eea0c 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,13 @@
package com.panzhihua.service_user.model.dos;
+import java.io.Serializable;
+import java.util.Date;
+
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 lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,7 +61,7 @@
private Date businessTime;
/**
- * 业务状态 1未通过、取消 2 成功
+ * 业务状态 1未通过、取消 2 成功
*/
private Integer businessStatus;
@@ -86,4 +86,8 @@
* 业务主键 用于跳转
*/
private Long businessId;
+ /**
+ * 社区活动类型 1志愿者活动 2居民活动
+ */
+ private Integer activityType;
}
--
Gitblit v1.7.1