From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
index 2fe8066..28a0702 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
@@ -34,13 +34,13 @@
private Timestamp updateTime;
//目标指标分解列表
- private List<TargetDivideDetail> targetDivideDetailList = new ArrayList<>();
+ private List<TargetDivideDetailDto> targetDivideDetailList = new ArrayList<>();
- public List<TargetDivideDetail> getTargetDivideDetailList() {
+ public List<TargetDivideDetailDto> getTargetDivideDetailList() {
return targetDivideDetailList;
}
- public void setTargetDivideDetailList(List<TargetDivideDetail> targetDivideDetailList) {
+ public void setTargetDivideDetailList(List<TargetDivideDetailDto> targetDivideDetailList) {
this.targetDivideDetailList = targetDivideDetailList;
}
--
Gitblit v1.9.2