From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 19 九月 2022 18:05:24 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java index f8f63a1..01de9ff 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java @@ -10,12 +10,14 @@ public class EmergencySuppliesInspectReqDTO { private Long id; - + //物资id private Long suppliesId; + //检查结果 private String inspectResult; + //检查时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date inspectTime; - + //检查人列表 private List<EmergencySuppliesInspectUserReqDTO> userList; -- Gitblit v1.9.2