From 0da2c08f679cb546fab3a0a7c3d6ff472bb87a8c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 21:24:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java
index 5989744..14b6a4c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java
@@ -1,7 +1,9 @@
 package com.dy.pipIrrWechat.command.dto;
 
-import jakarta.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @author ZhuBaoMin
@@ -14,22 +16,15 @@
     public static final long serialVersionUID = 202407231056001L;
 
     /**
-     * 闃�鎺у櫒鍦板潃
+     * 铏氭嫙鍗D
      */
-    @NotBlank(message = "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖")
-    private String rtuAddr;
+    private Long vcId;
 
     /**
-     * 铏氭嫙鍗$紪鍙�
+     * 璁″垝寮�闃�鏃堕棿
      */
-    @NotBlank(message = "铏氭嫙鍗$紪鍙蜂笉鑳戒负绌�")
-    private String vcNum;
-
-    /**
-     * 璁㈠崟鍙�
-     */
-    @NotBlank(message = "璁㈠崟鍙蜂笉鑳戒负绌�")
-    private String orderNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date plannedOpenTime;
 
     /**
      * 鐢ㄦ按鏃堕暱锛屾嫢鏈夊畾鏃跺叧闃�

--
Gitblit v1.8.0