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/ComActIntegralUserTradeDO.java | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java
index 91bc6b6..a47fb13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.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
@@ -58,7 +58,7 @@
private Integer amount;
/**
- * 变动类型（1.增加 2.减少）
+ * 变动类型（1.增加 2.减少）
*/
private Integer changeType;
@@ -82,10 +82,18 @@
*/
private Long createBy;
+ @Override
+ public String toString() {
+ return "ComActIntegralUserTradeDO{" + "id=" + id + ", userId=" + userId + ", integralId=" + integralId
+ + ", communityId=" + communityId + ", serviceId=" + serviceId + ", serviceType=" + serviceType + ", amount="
+ + amount + ", changeType=" + changeType + ", remark=" + remark + ", identityType=" + identityType
+ + ", createAt=" + createAt + ", createBy=" + createBy + "}";
+ }
+
/**
- * 变动类型（1.增加 2.减少）
+ * 变动类型（1.增加 2.减少）
*/
- public interface changeType{
+ public interface changeType {
int add = 1;
int reduce = 2;
}
@@ -93,27 +101,9 @@
/**
* 交易身份类型（1.居民 2.党员 3.志愿者）
*/
- public interface identityType{
+ public interface identityType {
int jm = 1;
int dy = 2;
int zyz = 3;
- }
-
- @Override
- public String toString() {
- return "ComActIntegralUserTradeDO{" +
- "id=" + id +
- ", userId=" + userId +
- ", integralId=" + integralId +
- ", communityId=" + communityId +
- ", serviceId=" + serviceId +
- ", serviceType=" + serviceType +
- ", amount=" + amount +
- ", changeType=" + changeType +
- ", remark=" + remark +
- ", identityType=" + identityType +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1