From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java
index b1a94b3..ed2d87b 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java
@@ -1,26 +1,41 @@
package com.matrix.system.shopXcx.api.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.pojo.BasePageQueryDto;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotNull;
+import java.util.Date;
@Data
@ApiModel(value = "ScoreFlowDto", description = "积分流水查询参数接收类")
public class ScoreFlowDto extends BasePageQueryDto {
- @NotNull(message = "查询月份不能为空")
+
@ApiModelProperty(value = "查询月份",example = "2021-03")
private String queryTime;
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+ private Date beginTime;
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+ private Date endTime;
@ApiModelProperty(value = "收支类型 不传全部，1，收入，2支出", example = "1")
private Integer revenueType;
- @ApiModelProperty(hidden = true)
- private String userId;
+
+ @ApiModelProperty(value = "会员id", example = "1")
+ private Long vipId;
+
+ @ApiModelProperty(value = "备注", example = "1")
+ private String remarks;
}
--
Gitblit v1.9.1