From bf812851cdecb1e2ba65b8225cb1833226213f4d Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Thu, 27 Jun 2024 17:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=BA=9F=E9=A9=B3=E5=9B=9E?=
=?UTF-8?q?=E7=BB=B4=E4=BF=AE=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/app/BackReceiveMapper.xml | 2 +-
.../material/service/impl/RepairAuditDetailsServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index a2e778f1..bdcccede 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -531,7 +531,7 @@
company_id,
- audit_remark,
+ remark,
scrap_type,
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 8761c399..893996a8 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -293,7 +293,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
scrapApplyDetails.setCreateTime(new Date());
scrapApplyDetails.setCompanyId((long) companyId);
- scrapApplyDetails.setAuditRemark(bean.getScrapReason());
+ scrapApplyDetails.setRemark(bean.getScrapReason());
//根据fileIds获取所有的图片地址
if (StringUtils.isNotEmpty(bean.getFileIds())){
String[] fileIsList = bean.getFileIds().split(",");