From 5940edc063eca2fbbef6dc73105b9d306923f975 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Fri, 2 Feb 2024 17:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java         | 2 ++
 .../src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java
index 27b148da..00f83404 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java
@@ -20,6 +20,8 @@ public class SzrwDto {
 
     private String status;
 
+    private String remark;
+
     /** 计划完成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "计划完成时间", width = 30, dateFormat = "yyyy-MM-dd")
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
index d7717121..266851e4 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
@@ -52,6 +52,7 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
             szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
             szrwDto.setStatus(record.getStatus());
+            szrwDto.setRemark(record.getRemark());
 
             szrwDto.setPlanTime(record.getPlanTime());
             szrwDto.setCompletionTime(record.getCompletionTime());