From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java
index 835a3a4..04a3c12 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -53,13 +53,13 @@
/**
* 限制类型（1.月 2.日）
*/
- @TableField(value = "type", updateStrategy = FieldStrategy.IGNORED)
+ @TableField(value = "type", updateStrategy = FieldStrategy.IGNORED)
private Integer type;
/**
* 限制次数
*/
- @TableField(value = "count", updateStrategy = FieldStrategy.IGNORED)
+ @TableField(value = "count", updateStrategy = FieldStrategy.IGNORED)
private Integer count;
/**
@@ -82,10 +82,18 @@
*/
private String remark;
+ @Override
+ public String toString() {
+ return "ComActIntegralRuleDO{" + "id=" + id + ", name=" + name + ", communityId=" + communityId + ", amount="
+ + amount + ", integralDescribe=" + integralDescribe + ", isRestrict=" + isRestrict + ", type=" + type
+ + ", count=" + count + ", createAt=" + createAt + ", updateAt=" + updateAt + ", integralType="
+ + integralType + ", remark=" + remark + "}";
+ }
+
/**
* 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
*/
- public interface integralType{
+ public interface integralType {
int fbssp = 1;
int fbwxy = 2;
int cyystp = 3;
@@ -98,7 +106,7 @@
/**
* 是否限制（1.是 2.否）
*/
- public interface isRestrict{
+ public interface isRestrict {
int yes = 1;
int no = 2;
}
@@ -106,26 +114,8 @@
/**
* 限制类型（1.月 2.日）
*/
- public interface type{
+ public interface type {
int month = 1;
int day = 2;
- }
-
- @Override
- public String toString() {
- return "ComActIntegralRuleDO{" +
- "id=" + id +
- ", name=" + name +
- ", communityId=" + communityId +
- ", amount=" + amount +
- ", integralDescribe=" + integralDescribe +
- ", isRestrict=" + isRestrict +
- ", type=" + type +
- ", count=" + count +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- ", integralType=" + integralType +
- ", remark=" + remark +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1