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

platformapi/tiktok_shop/tiktok_api/store.go

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

utils/typeconv.go

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