Merge branch 'master' of e.coding.net:rosydev/baseapi

This commit is contained in:
邹宗楠
2022-10-08 14:16:40 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -65,7 +65,7 @@ func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCre
if response.Code != RequestSuccessCode { if response.Code != RequestSuccessCode {
return nil, errors.New(response.SubMsg) return nil, errors.New(response.SubMsg)
} }
return response.Data, nil return response.Data, err
} }
// EditStore 编辑门店 // EditStore 编辑门店

View File

@@ -67,7 +67,7 @@ func MustMarshal(obj interface{}) []byte {
} }
func TryInterface2Int64(data interface{}) (num int64, err error) { func TryInterface2Int64(data interface{}) (num int64, err error) {
if data == nil { if data == nil && IsNil(data) {
return num, errors.New("data is nil") return num, errors.New("data is nil")
} }
if dataNumber, ok := data.(int64); ok { if dataNumber, ok := data.(int64); ok {