From 2b72e2b592f642b23e5c78a3ffdab3fc1fafba11 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 09 十月 2021 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java
index e5a6704..ec8977e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.dtos.community.wallet;
+import java.util.List;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,7 +16,7 @@
@ApiModelProperty("手机号")
private String phone;
- @ApiModelProperty(value = "社区主键",hidden = true)
+ @ApiModelProperty(value = "社区主键", hidden = true)
private Long communityId;
@ApiModelProperty("交易类型（1.发布随手拍 2.结算）")
@@ -26,9 +28,30 @@
@ApiModelProperty("结束时间")
private String endTime;
- @ApiModelProperty(value = "分页-当前页数",example = "1")
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
private Long pageNum = 1L;
- @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize = 10L;
+
+ @ApiModelProperty("排序（1.升序 2.降序）")
+ private Integer sort;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("关键词")
+ private String expenditureKeyWord;
+
+ @ApiModelProperty("奖励内容")
+ private String remark;
+
+ @ApiModelProperty("导出id集合")
+ private List<Long> tradeIds;
}
--
Gitblit v1.7.1