Merge branch 'master' of github.com:hainatravel/information-system

README.md

@@ -2,3 +2,5 @@
 
 网前订单数量查看 https://cht.mycht.cn/info.php/look_order/status
 商务加传统订单超过500页面报错，可用于监控
+
+test

application/models/recommends_and_tips_model.php

@@ -6,7 +6,7 @@ class recommends_and_tips_model extends CI_Model
     function __construct()
     {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
     }