Merge branch 'dev-xpy' into dev

app/common/dao/store/StoreAttrTemplateDao.php

@@ -111,6 +111,6 @@ class StoreAttrTemplateDao extends BaseDao
 
     public function getList($merId)
     {
-        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('attr_template_id,template_name,template_value')->select();
+        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('attr_template_id,template_name,template_value')->order('attr_template_id DESC')->select();
     }
 }