合并分支 'liuzhen' 到 'master'

订单调试



查看合并请求 !156

@@ -123,6 +123,8 @@ class OrderSalesmanController extends WeChatBaseController
         $this->success('SUCCESS','',$grade);
     }
     public function getOrderSalesman(){
+        set_time_limit(0);
+        ini_set('memory_limit','512M');
         $param = $this->request->param();
         if(!empty($param['school'])){
             $where['school'] = ['like',"%$param[school]%"];

@@ -780,7 +780,8 @@ class PersonalcenterController extends WeChatBaseController{
      * 点击学校时获取年级班级
      */
     public function get_grade_class(){
-
+        set_time_limit(0);
+        ini_set('memory_limit','256M');
         $school_id = $_POST['id'];
         $grade_class = Db::name('grade_class') -> where("school_id",$school_id) -> select() -> toArray();
         if(!empty($grade_class)){