From 1b1248f500a49f11f12c3cf9b469c300430b4514 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 18 八月 2025 10:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/dto/PointsFlowQueryDTO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/webmanage/dto/PointsFlowQueryDTO.java b/src/main/java/com/webmanage/dto/PointsFlowQueryDTO.java
index 3234cf0..98aaa5c 100644
--- a/src/main/java/com/webmanage/dto/PointsFlowQueryDTO.java
+++ b/src/main/java/com/webmanage/dto/PointsFlowQueryDTO.java
@@ -25,20 +25,23 @@
@ApiModelProperty("鍗曚綅ID")
private Long unitId;
- @ApiModelProperty("娴佹按绫诲瀷(鑾峰緱/娑堣垂)")
- private String flowType;
+ @ApiModelProperty("娴佹按绫诲瀷(0鑾峰緱1/娑堣垂)")
+ private Integer dataType;
@ApiModelProperty("绉垎鏉ユ簮")
private String pointsSource;
+
+ @ApiModelProperty("鏁版嵁绫荤洰")
+ private String dataCategory;
@ApiModelProperty("鍏宠仈璁㈠崟ID")
private String orderId;
@ApiModelProperty("寮�濮嬫椂闂�")
- private LocalDateTime startTime;
+ private LocalDateTime flowStartTime;
@ApiModelProperty("缁撴潫鏃堕棿")
- private LocalDateTime endTime;
+ private LocalDateTime flowEndTime;
@ApiModelProperty("鎺掑簭瀛楁")
private String orderBy = "created_at";
--
Gitblit v1.8.0