From cdbb242778d3a93eb9305317e7400e01895fec14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 23 Feb 2021 14:22:22 +0800 Subject: [PATCH] aa --- business/model/store.go | 14 ++++++++------ controllers/cms_msg.go | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/business/model/store.go b/business/model/store.go index a892ed681..0c68e82f3 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -468,12 +468,14 @@ func (*StoreMap) TableUnique() [][]string { type StoreCourierMap struct { ModelIDCULD - StoreID int `orm:"column(store_id)" json:"storeID"` - VendorID int `orm:"column(vendor_id)" json:"vendorID"` - VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` - Status int `json:"status"` - AuditStatus int `json:"auditStatus"` - VendorStatus int `json:"vendorStatus"` + StoreID int `orm:"column(store_id)" json:"storeID"` + VendorID int `orm:"column(vendor_id)" json:"vendorID"` + VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` + Status int `json:"status"` + AuditStatus int `json:"auditStatus"` + VendorStatus int `json:"vendorStatus"` + VendorStoreName string `orm:"size(255)" json:"vendorStoreName"` //平台门店名，由京西到平台 + // 以下数据仅用于同步使用 Lng int `json:"-"` // 乘了10的6次方 Lat int `json:"-"` // 乘了10的6次方 diff --git a/controllers/cms_msg.go b/controllers/cms_msg.go index da18139e4..3ecea9932 100644 --- a/controllers/cms_msg.go +++ b/controllers/cms_msg.go @@ -22,7 +22,7 @@ type MsgController struct { // @Param title formData string true "消息标题" // @Param content formData string true "消息内容" // @Param messageType formData int true "消息类型，1为普通给商家发的消息，3为活动内容通知" -// @Param actInfo formData string true "如果是活动内容通知需传" +// @Param actInfo formData string false "如果是活动内容通知需传" // @Param isAsync formData bool false "是否异步操作，缺省否" // @Param isContinueWhenError formData bool false "单个失败是否继续，缺省false" // @Success 200 {object} controllers.CallResult