From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java | 5 +++--
1 files changed, 3 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..59a4d74 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;
@@ -61,5 +59,8 @@
@ApiModelProperty(value = "支付结束时间")
private String payEndTime;
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
+
}
--
Gitblit v1.7.1