From 4c169d85883486aa77fb1b2d5b2aafc1d4325aa1 Mon Sep 17 00:00:00 2001
From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 15:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E8=B4=B9=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pusong/business/domain/PsContractInfo.java    | 4 ++++
 .../com/pusong/business/domain/bo/PsContractInfoBo.java    | 7 ++++++-
 .../com/pusong/business/domain/vo/PsContractInfoVo.java    | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractInfo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractInfo.java
index cdd98ea..da130f1 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractInfo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsContractInfo.java
@@ -155,4 +155,8 @@ public class PsContractInfo extends TenantEntity {
      * 原合同编码（续费合同使用）
      */
     private String srcContractCode;
+    /**
+     * 续费日期
+     */
+    private Date renewalDate;
 }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java
index 320456d..ed2dcb9 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java
@@ -67,7 +67,12 @@ public class PsContractInfoBo  {
     @NotNull(message = "服务周期结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endServiceDate;
-
+    /**
+     * 续期日期
+     */
+    @NotNull(message = "服务周期结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date renewalDate;
     /**
      * 客户是否到达现场
      */
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java
index 6414d28..1c25db6 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java
@@ -229,4 +229,8 @@ public class PsContractInfoVo implements Serializable {
      * 原合同编码（续费合同使用）
      */
     private String srcContractCode;
+    /**
+     * 续费日期
+     */
+    private Date renewalDate;
 }