Skip to content

N
newShopBack
Commit 440117d7 authored by 郭勇志's avatar 郭勇志
Browse files
Options

字段改名

parent 8fba2e1c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
backend/controllers/v1/transport/O2oDeliveryController.php
View file @ 440117d7
...@@ -77,7 +77,7 @@ class O2oDeliveryController extends BaseController ...@@ -77,7 +77,7 @@ class O2oDeliveryController extends BaseController
->andFilterWhere(['scds.SETTING_TYPE'=>O2O_FLAG])//设定为o2o配送 ->andFilterWhere(['scds.SETTING_TYPE'=>O2O_FLAG])//设定为o2o配送
->andFilterWhere(['or',['sb.CODE'=>$model->BRANCH_INFO],['like','sb.NAME',$model->BRANCH_INFO]]) ->andFilterWhere(['or',['sb.CODE'=>$model->BRANCH_INFO],['like','sb.NAME',$model->BRANCH_INFO]])
->andFilterWhere(['sb.GUID'=>$branchGuid]) ->andFilterWhere(['sb.GUID'=>$branchGuid])
->orFilterWhere(['sb.PARENTGUID'=>$parentBranchGuid]) ->orFilterWhere(['sb.PARENT_GUID'=>$parentBranchGuid])
->asArray()->all(); ->asArray()->all();
return new ArrayDataProvider( return new ArrayDataProvider(
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment