From 5f343c493b047b93cd47f49c5698c784ebbf8d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 24 Dec 2020 17:19:08 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go | 2 +-
 business/model/job.go       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index bfeef6dd8..bd6f88740 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -1193,7 +1193,7 @@ func GetAllDeliveryDetail(ctx *jxcontext.Context, vendorWaybillID, comType strin
 		jobOrder.WaybillStatus = model.OrderStatusFinished
 	}
 	dao.UpdateEntity(db, jobOrder, "WaybillQueryTime", "WaybillInfo", "WaybillStatus")
-	return result, err
+	return getWaybillDetailInfoResult, err
 }
 
 func CheckJdDeliveryWeight(ctx *jxcontext.Context) (err error) {
diff --git a/business/model/job.go b/business/model/job.go
index d7cf2dd67..844552bea 100644
--- a/business/model/job.go
+++ b/business/model/job.go
@@ -205,10 +205,10 @@ type JobOrder struct {
 	DropShippingAutoAddress   string    `json:"dropShippingAutoAddress"`
 	DropShippingCityCode      int       `json:"dropShippingCityCode"`
 	DropShippingDistrictCode  int       `json:"dropShippingDistrictCode"`
-	VendorWaybillID           string    `json:"vendorWaybillID"`              //运单号
-	WaybillInfo               string    `orm:"type(text)" json:"waybillInfo"` //物流信息
-	WaybillQueryTime          time.Time `json:"waybillQueryTime"`             //上次查询时间
-	WaybillStatus             int       `json:"waybillStatus"`                //运单状态（一件代发）
+	VendorWaybillID           string    `orm:"column(vendor_waybill_id)" json:"vendorWaybillID"` //运单号
+	WaybillInfo               string    `orm:"type(text)" json:"waybillInfo"`                    //物流信息
+	WaybillQueryTime          time.Time `json:"waybillQueryTime"`                                //上次查询时间
+	WaybillStatus             int       `json:"waybillStatus"`                                   //运单状态（一件代发）
 }
 
 func (v *JobOrder) TableIndex() [][]string {