From 833893d56463f64332d5f5a3abcf774e8ad3f9c5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 19 七月 2022 17:31:33 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
index 66f33a6..7d88e82 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
@@ -10,7 +10,7 @@
private Long planId;
- private Long userUId;
+ private Long userUid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreate;
@@ -33,12 +33,12 @@
this.planId = planId;
}
- public Long getUserUId() {
- return userUId;
+ public Long getUserUid() {
+ return userUid;
}
- public void setUserUId(Long userUId) {
- this.userUId = userUId;
+ public void setUserUid(Long userUid) {
+ this.userUid = userUid;
}
public Date getStartCreate() {
@@ -62,7 +62,7 @@
return "EmergencyPlanLogRespDTO{" +
"id=" + id +
", planId=" + planId +
- ", userUId=" + userUId +
+ ", userUid=" + userUid +
", startCreate=" + startCreate +
", remark='" + remark + '\'' +
'}';
--
Gitblit v1.9.2