From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerchantBasicdataVo.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerchantBasicdataVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerchantBasicdataVo.java
index 8a21074..fe1d161 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerchantBasicdataVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerchantBasicdataVo.java
@@ -13,23 +13,27 @@
*/
private Integer status;
/**
+ * 请求流水号
+ */
+ private String reqSeqId;
+ /**
* 审核结果；Y：审核通过，N：审核拒绝，F：失败
*/
- private String audit_status;
+ private String auditStatus;
/**
* 审核描述，审核人员编辑的审核描述
*/
- private String audit_desc;
+ private String auditDesc;
/**
* 商户号
*/
- private String huifu_id;
+ private String huifuId;
/**
* 取现卡序列号
*/
- private String token_no;
+ private String tokenNo;
/**
* 申请单号
*/
- private String apply_no;
+ private String applyNo;
}
--
Gitblit v1.7.1