From fce5d0e7fcbd00361e032d3ccdff4b89891c4f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Mon, 20 Oct 2025 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?10-20-=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/xzd/domain/XzdZbjghyd.java    | 13 ++++++++++++-
 .../org/dromara/xzd/domain/bo/XzdZbjghydBo.java    | 14 +++++++++++++-
 .../org/dromara/xzd/domain/vo/XzdZbjghydVo.java    | 13 ++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java
index 93342df3..a97c4ab3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdZbjghyd.java
@@ -1,11 +1,15 @@
 package org.dromara.xzd.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 质保金归还约定对象 xzd_zbjghyd
@@ -37,10 +41,17 @@ public class XzdZbjghyd extends BaseEntity {
      */
     private Long zbq;
 
+    /**
+     * 归还日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghrq;
+
     /**
      * 归还比例
      */
-    private Long ghbl;
+    private BigDecimal ghbl;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java
index 7066cbe4..92777002 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdZbjghydBo.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.domain.XzdZbjghyd;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.EditGroup;
@@ -7,6 +8,10 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 质保金归还约定业务对象 xzd_zbjghyd
@@ -35,10 +40,17 @@ public class XzdZbjghydBo extends BaseEntity {
      */
     private Long zbq;
 
+    /**
+     * 归还日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghrq;
+
     /**
      * 归还比例
      */
-    private Long ghbl;
+    private BigDecimal ghbl;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java
index 881bb31f..dc3d8971 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdZbjghydVo.java
@@ -1,13 +1,17 @@
 package org.dromara.xzd.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.domain.XzdZbjghyd;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**
@@ -42,11 +46,18 @@ public class XzdZbjghydVo implements Serializable {
     @ExcelProperty(value = "质保期(月份)")
     private Long zbq;
 
+    /**
+     * 归还日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghrq;
+
     /**
      * 归还比例
      */
     @ExcelProperty(value = "归还比例")
-    private Long ghbl;
+    private BigDecimal ghbl;
 
     /**
      * 备注