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

business/jxstore/act/act.go

@@ -993,6 +993,8 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 				storeSkuBind.LastOperator = ctx.GetUserName()
 				storeSkuBindList = append(storeSkuBindList, storeSkuBind)
 			}
+		} else if dao.IsNoRowsError(err) { // 忽略不存在错
+			err = nil
 		} else {
 			errList.AddErr(fmt.Errorf("获取门店:%d商品:%d出错:%s", v.StoreID, v.SkuID, err))
 		}