From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java
index e3ce02d..e1c213f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java
@@ -1,13 +1,13 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
/**
* @auther lyq
@@ -112,34 +112,23 @@
*/
private Integer status;
+ @Override
+ public String toString() {
+ return "ComActIntegralUserDO{" + "id=" + id + ", userId=" + userId + ", communityId=" + communityId
+ + ", integralSum=" + integralSum + ", integralAvailableSum=" + integralAvailableSum + ", integralFrozenSum="
+ + integralFrozenSum + ", integralParty=" + integralParty + ", integralAvailableParty="
+ + integralAvailableParty + ", integralFrozenParty=" + integralFrozenParty + ", integralVolunteer="
+ + integralVolunteer + ", integralAvailableVolunteer=" + integralAvailableVolunteer
+ + ", integralFrozenVolunteer=" + integralFrozenVolunteer + ", integralResident=" + integralResident
+ + ", integralAvailableResident=" + integralAvailableResident + ", integralFrozenResident="
+ + integralFrozenResident + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
+ }
+
/**
* 状态（1.启用 2.禁用）
*/
- public interface status{
+ public interface status {
int yes = 1;
int no = 2;
- }
-
- @Override
- public String toString() {
- return "ComActIntegralUserDO{" +
- "id=" + id +
- ", userId=" + userId +
- ", communityId=" + communityId +
- ", integralSum=" + integralSum +
- ", integralAvailableSum=" + integralAvailableSum +
- ", integralFrozenSum=" + integralFrozenSum +
- ", integralParty=" + integralParty +
- ", integralAvailableParty=" + integralAvailableParty +
- ", integralFrozenParty=" + integralFrozenParty +
- ", integralVolunteer=" + integralVolunteer +
- ", integralAvailableVolunteer=" + integralAvailableVolunteer +
- ", integralFrozenVolunteer=" + integralFrozenVolunteer +
- ", integralResident=" + integralResident +
- ", integralAvailableResident=" + integralAvailableResident +
- ", integralFrozenResident=" + integralFrozenResident +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1