From 66477d8e6dc9d2e80d9b288dfc6ac115aa580724 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Jun 2024 06:07:36 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java  | 11 +++++------
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 +++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index de6d3dbe7..36ec59071 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -350,10 +350,7 @@ public class EmisWaybill extends BaseEntity
     /* sign_date */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date signDate;
-    /* 揽收图片备注 */
-    private String billPicSendRmk;
-    /* 签收底单图片 */
-    private String billPicDispatchRmk;
+
     /* 时区偏差 */
     private String timezoneOffset;
     /* 付款状态 字典:emis_payment_status */
@@ -441,9 +438,11 @@ public class EmisWaybill extends BaseEntity
 
     // - 揽收底单图片
     // - 签收底单图片
+    /* 揽收图片备注 */
+    private String billPicSendRmk;
+    /* 签收底单图片 */
+    private String billPicDispatchRmk;
     // - 货物图片
-//    private String billPicSendRmk;
-//    private String billPicDispatchRmk;
     private String billPicGoodsRmk;
 
     // 是否已锁单 T,锁单原因
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 5ff823c65..2cf8011c3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -156,8 +156,9 @@
         <result property="signManCode"    column="sign_man_code"    />
         <result property="signSiteCode"    column="sign_site_code"    />
         <result property="signDate"    column="sign_date"    />
-        <result property="billPicSendRmk"    column="bill_pic_send_rmk"    />
-        <result property="billPicDispatchRmk"    column="bill_pic_dispatch_rmk"    />
+
+
+
         <result property="timezoneOffset"    column="timezone_offset"    />
         <result property="paymentStatus"    column="payment_status"    />
         <result property="paymentDate"    column="payment_date"    />
@@ -203,6 +204,12 @@
 
         <result property="problemTypeName"    column="problem_type_name"    />
 
+
+        <result property="billPicSendRmk"    column="bill_pic_send_rmk"    />
+        <result property="billPicDispatchRmk"    column="bill_pic_dispatch_rmk"    />
+        <result property="billPicGoodsRmk"    column="goods_pics"    />
+
+
     </resultMap>
 
     <resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">