From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +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 |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 4c75310..1c0b9ff 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
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel("收益结算列表请求参数")
 public class PageComActWalletTradeAdminDTO {
@@ -34,4 +36,22 @@
 
     @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