Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -219,6 +219,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['special'])){
         if(isset($this->map['special'])){
             $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
             $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
         }
         }
+        if(isset($this->map['is_remain_today'])){
+            $query = $query->where('gl_project.is_remain_today',$this->map['is_remain_today']);
+        }
         if(isset($this->map['manager_mid']) && !empty($this->map['manager_mid'])){
         if(isset($this->map['manager_mid']) && !empty($this->map['manager_mid'])){
             $query = $query->where('gl_project_deploy_build.manager_mid','like','%'.$this->map['manager_mid'].'%');
             $query = $query->where('gl_project_deploy_build.manager_mid','like','%'.$this->map['manager_mid'].'%');
         }
         }