Administrator / test_1

Commit e687688f9dec8452c3021fb41e324d8d6cc90fc2

Authored by Administrator
1 parent fe1397b3

after marge

Showing 1 changed file with 0 additions and 4 deletions   Show diff stats
Inline Side-by-side
backend/controllers/CheckPriceController.php
  Show/Hide comments   View file @e687688
... ... @@ -66,11 +66,7 @@ class CheckPriceController extends BaseController
66 66 }
67 67  
68 68 //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
69   -<<<<<<< HEAD
70   - $query = Importer::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
71   -=======
72 69 $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
73   ->>>>>>> ead5cb60ac983cdb680ec70731de195b537be6cd
74 70  
75 71 $provider = new ActiveDataProvider([
76 72 'query' => $query,
... ...