From 147212ecc14f456d4a87dafec5a90972c6bbb690 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 27 Jun 2024 10:54:28 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybillProblemInfo.java | 10 ++++++++--
 .../resources/mapper/EmisWaybillProblemInfoMapper.xml  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index 739fb321a..c40335e05 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -94,12 +94,18 @@ public class EmisWaybillProblemInfo extends BaseEntity
 
 //    扩展 通知网点
     private String problemTypeName;
+
     private String sendSiteName;
-    private String registerManName;
+
     private String registerSiteName;
+    private String registerManName;
+    private String registerManDeptName;
+
 
     private String reversionSiteName;
-    private String registerManDeptName;
+    private String reversionManName;
+
+
 
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index df3ca80de..b45db4448 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -38,7 +38,7 @@
         <association property="registerSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
         <association property="registerManName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
         <association property="reversionSiteName"    column="reversion_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerManDeptName"    column="reversion_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDeptNameByEmpCode"/>
+        <association property="reversionManName"    column="reversion_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
 
     </resultMap>