From e6fa0149e0c8690efc9c444650c6ef82f04ba54b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 19:38:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java
index 8795234..6bda5f6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java
@@ -59,10 +59,14 @@
@TableField("audit_msg")
private String auditMsg;
- @ApiModelProperty(value = "状态（1=申请中，2=已到账）")
+ @ApiModelProperty(value = "状态（1=申请中，2=已到账，3=失败）")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "处理结果")
+ @TableField("remark")
+ private String remark;
+
@ApiModelProperty(value = "到账时间")
@TableField("arrival_time")
private LocalDateTime arrivalTime;
--
Gitblit v1.7.1