Merge branch 'dev-xpy' into dev

app/common/repositories/store/StoreAttrTemplateRepository.php

@@ -58,7 +58,8 @@ class StoreAttrTemplateRepository extends BaseRepository
     public function getList($merId, array $where, $page, $limit)
     {
         $query = $this->dao->search($merId, $where);
-        $count = $query->count($this->dao->getPk());
+        $CountQuery = clone $query;
+        $count = $CountQuery->count($this->dao->getPk());
         $list = $query->page($page, $limit)->select();
         return compact('count', 'list');
     }