From 96a7015065775e5c3bc3d6458b86b28ad7bfb46b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 13 三月 2025 17:53:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
index 60645d1..19fd59f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
@@ -46,8 +46,6 @@
     @ApiModelProperty(value = "流水状态 1=正常 2=异常")
     private Integer flowStatus;
 
-    @ApiModelProperty(value = "流水类型 1=系统 2=银行")
-    private Integer flowType;
 
     @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
     private Integer payType;

--
Gitblit v1.7.1