Merge remote-tracking branch 'origin/test' into test

application/model/GHouses.php

@@ -707,12 +707,15 @@ class GHouses extends BaseModel
         if (isset($params["status"])) {
             $where_["status"] = $params["status"];
         }
+        if (isset($params["residue_num"])) {
+            $where_["residue_num"] = $params["residue_num"];
+        }
 
         $result = Db::table($this->table)
             ->field($field)
             ->where($where_)
             ->select();
-        //echo Db::table($this->table)->getLastSql();
+      //  echo Db::table($this->table)->getLastSql();
         return $result;
     }
     /**

application/task/controller/UpdateShopStatusTask.php

@@ -51,7 +51,7 @@ class UpdateShopStatusTask
         $params                = [];
         $time_                 = date('Y-m-d', strtotime("-$day day"));
         $params["status"]      = 1;
-        $params["create_time"] = array( 'lt', $time_ );
+        $params["create_time"] = array( 'lt', $time_ . " 23:59:59");
         $params["is_execute"]  = 0;
 
         $result = $this->shopModel->getShopListByTime($field, $params);