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/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java
index 4160a46..56ff7a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.community.integral.admin;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
@Data
@ApiModel("管理后台-社区积分明细列表")
@@ -30,15 +31,15 @@
@ApiModelProperty("交易时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty(value = "是否志愿者（0.否 1.是）",hidden = true)
+ @ApiModelProperty(value = "是否志愿者（0.否 1.是）", hidden = true)
private Integer isVolunteer;
- @ApiModelProperty(value = "是否党员（0.否 1.是）",hidden = true)
+ @ApiModelProperty(value = "是否党员（0.否 1.是）", hidden = true)
private Integer isPartymember;
/**
* 是否志愿者（0.否 1.是）
*/
- public interface isVolunteer{
+ public interface isVolunteer {
int no = 0;
int yes = 1;
}
@@ -46,7 +47,7 @@
/**
* 是否党员（0.否 1.是）
*/
- public interface isPartymember{
+ public interface isPartymember {
int no = 0;
int yes = 1;
}
--
Gitblit v1.7.1