From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Withdraw.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Withdraw.java
index 186cb6e..afed644 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Withdraw.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Withdraw.java
@@ -60,7 +60,7 @@
 
     @ApiModelProperty("订单id")
     @TableField("order_id")
-    private Integer orderId;
+    private String orderId;
 
     /**
      * 申请状态中文(导出用) 0待审核;1已通过;2已驳回

--
Gitblit v1.7.1