合并分支 'akun' 到 'master'

Akun



查看合并请求 !445

@@ -164,10 +164,10 @@ class CNoticeController extends BaseController
      */
      */
     public function getCountry(){
     public function getCountry(){
         $countryModel = new CountryModel();
         $countryModel = new CountryModel();
-        $info = $countryModel->read(['project_id'=>$this->user['project_id']],['id','country_lists']);
+        $info = $countryModel->read(['project_id'=>$this->user['project_id']],['id','country_sort']);
         $ids = [];
         $ids = [];
         if($info !== false){
         if($info !== false){
-            $ids = explode(',',$info['country_lists']);
+            $ids = explode(',',$info['country_sort']);
         }
         }
         $languageModel = new WebLanguage();
         $languageModel = new WebLanguage();
         //根据排序查询选中的小语种
         //根据排序查询选中的小语种