From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
index 7ec32da..aa75be3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
@@ -1,17 +1,32 @@
 package com.gkhy.safePlatform.emergency.model.dto.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 public class EmergencyDrillPlanReqDTO {
 
+    private String makingUserName;
+
+    public String getMakingUserName() {
+        return makingUserName;
+    }
+
+    public void setMakingUserName(String makingUserName) {
+        this.makingUserName = makingUserName;
+    }
+
+
     private Long id;
 
     private Integer status;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date makingPlanDate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date drillPlanDate;
 
     private Long makingUserUid;
@@ -24,13 +39,13 @@
 
     private BigDecimal drillExpense;
 
-    private String drillLevel;
+    private Byte drillLevel;
 
     private String drillAddress;
 
     private String drillName;
 
-    private String drillWay;
+    private Byte drillWay;
 
     private String insuranceMeasures;
 
@@ -114,11 +129,11 @@
         this.drillExpense = drillExpense;
     }
 
-    public String getDrillLevel() {
+    public Byte getDrillLevel() {
         return drillLevel;
     }
 
-    public void setDrillLevel(String drillLevel) {
+    public void setDrillLevel(Byte drillLevel) {
         this.drillLevel = drillLevel;
     }
 
@@ -138,11 +153,11 @@
         this.drillName = drillName;
     }
 
-    public String getDrillWay() {
+    public Byte getDrillWay() {
         return drillWay;
     }
 
-    public void setDrillWay(String drillWay) {
+    public void setDrillWay(Byte drillWay) {
         this.drillWay = drillWay;
     }
 

--
Gitblit v1.9.2