From a5bdd8e5bc383684e996d608b3362e93824e2108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 29 May 2020 14:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 380570ce5..add5b23b5 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -1537,7 +1537,7 @@ func UpdateJdsWareID(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error)
 
 type tStoreSkuAudit struct {
 	model.StoreSkuAudit
-	model.SkuName
+	SkuName   string `orm:"size(255)" json:"skuName"`
 	StoreName string `json:"storeName"`
 	Name      string `json:"name"`
 }
@@ -1545,7 +1545,7 @@ type tStoreSkuAudit struct {
 func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, changeType int, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
 	var requestList []*tStoreSkuAudit
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS a.*, c.*, d.name store_name, b.name
+		SELECT SQL_CALC_FOUND_ROWS a.*, c.name sku_name, d.name store_name, b.name
 		  FROM store_sku_audit a
 		  LEFT JOIN user b ON a.user_id = b.user_id
 		  LEFT JOIN sku_name c ON c.id = a.name_id AND c.deleted_at = ?