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)){