From 8d70173f4b5644c6259fd583301f36f5f11bb1f6 Mon Sep 17 00:00:00 2001
From: liu <1085918938@qq.com>
Date: Mon, 14 Jul 2025 13:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4=E3=80=81=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=B5=84=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/payment/merchant/domain/bo/BusMerchantBo.java | 4 ++++
 .../org/dromara/payment/merchant/domain/vo/BusMerchantVo.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/bo/BusMerchantBo.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/bo/BusMerchantBo.java
index 9d45eef..a10d1f0 100644
--- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/bo/BusMerchantBo.java
+++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/bo/BusMerchantBo.java
@@ -450,6 +450,10 @@ public class BusMerchantBo extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern="yyyy-MM-dd")
     private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern="yyyy-MM-dd")
+    private Date regdate;
+    private String registeredAssets;
 
     private String scaleName;
 
diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/vo/BusMerchantVo.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/vo/BusMerchantVo.java
index 29673a1..eeacdf0 100644
--- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/vo/BusMerchantVo.java
+++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/merchant/domain/vo/BusMerchantVo.java
@@ -460,6 +460,9 @@ public class BusMerchantVo implements Serializable {
 
     private Integer isCanSetScale = 0;
 
+    private Date regdate;
+    private String registeredAssets;
+
     public String getVerifyStatusName() {
         if(this.verifyStatus != null){
             if(this.verifyStatus.equals(0l)){