Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/DAO/StoreGoodsClassGoods.php

@@ -27,7 +27,7 @@ class StoreGoodsClassGoodsModel extends \DAO\AbstractModel {
     public function getList($where,$field,$order = true){
         $this->setDb($this->dbName);
         if($order){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','DESC')->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','ASC')->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
     }