From b876f27c592c5d44e4b32b79d4ef4bc25fe88603 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 20 七月 2025 15:21:04 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo

---
 ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/FinanceFlowsDTO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/FinanceFlowsDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/FinanceFlowsDTO.java
index 4c06185..f9f7d27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/FinanceFlowsDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/FinanceFlowsDTO.java
@@ -21,8 +21,8 @@
     private String orderNo;
 
 
-    @ApiModelProperty(value = "类型:0-全部 1-收入 2-退款")
-    private Integer type = 0;
+    @ApiModelProperty(value = "类型: 1-收入 2-退款")
+    private Integer type ;
 
 
     @ApiModelProperty(value = "操作时间-开始")
@@ -34,4 +34,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime operateTimeEnd;
 
+    @ApiModelProperty(hidden = true)
+    private Integer offset;
+
 }

--
Gitblit v1.7.1