From d103a81c452ffb5082422f851f532ea2e4186a9e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 13:47:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java
index cf32302..a2fd25a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java
@@ -11,7 +11,7 @@
     @ApiModelProperty("加盟商id")
     private Integer franchId;
     @ApiModelProperty("加盟商名字，查询用")
-    private Integer franchName;
+    private String name;
     @ApiModelProperty("1扣款2充值")
     private Integer type;
     @ApiModelProperty("扣款时间1")

--
Gitblit v1.7.1