合并分支 'heshupeng' 到 'master'

区域代理商



查看合并请求 !381

@@ -77,7 +77,7 @@ class Store extends Backend
                         $where1[] = "(province = '{$province}' and city = '{$area[1]}' and region = '{$area[2]}')";
                     }
                 }
-                $where1 = $where1 ? implode(' or ',$where1) : 'id = 0';
+                $where1 = $where1 ? implode(' or ',$where1) : 'store.id = 0';
             }
 
             $total = $this->model