From 83ebc7b0ea5764e4f55be46932ce8e8de83de3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 28 Sep 2021 10:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/service/impl/ProjectDetailServiceImpl.java    | 3 +++
 .../src/main/java/com/jero/common/vo/PayMailBillVO.java       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index 953bbc35..d59d9bac 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -199,6 +199,9 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
                 if(!Objects.isNull(p.getPostStatus())){
                     p.setPostStatus_dictText(sysBaseAPI.translateDict("mail_type",String.valueOf(p.getPostStatus())));
                 }
+                if(!Objects.isNull(p.getSendMethod())){
+                    p.setSendMethod_dictText(sysBaseAPI.translateDict("mail_send",String.valueOf(p.getSendMethod())));
+                }
             });
             projectDetailVO.setMailBill(listPayMailBillVO);
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/PayMailBillVO.java
index 4d030376..b7ed5139 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/PayMailBillVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/PayMailBillVO.java
@@ -38,4 +38,8 @@ public class PayMailBillVO extends PayMailBill implements Serializable {
     @Dict(dicCode = "mail_type")
     @ApiModelProperty(value = "邮寄状态")
     private String postStatus_dictText;
+    /**快递公司(1:EMS,2:顺丰)*/
+    @ApiModelProperty(value = "快递公司")
+    private String sendMethod_dictText;
+
 }