From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang 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