Merge remote-tracking branch 'origin/don' into mark

This commit is contained in:
gazebo
2019-08-13 15:18:52 +08:00
3 changed files with 27 additions and 23 deletions

View File

@@ -292,7 +292,7 @@ func (c *TempOpController) TestStartOrEndOpStore() {
var vendorIDList []int
var storeIDList []int
if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDList, params.StoreIDs, &storeIDList); err == nil {
retVal, err = misc.StartOrEndOpStore(params.StartOrEndStore, vendorIDList, storeIDList, int16(params.StartTime), int16(params.EndTime), params.IsAsync, params.IsContinueWhenError)
retVal, err = misc.StartOrEndOpStore(params.Ctx, params.StartOrEndStore, vendorIDList, storeIDList, int16(params.StartTime), int16(params.EndTime), params.IsAsync, params.IsContinueWhenError)
}
return retVal, "", err
})