Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -2012,7 +2012,7 @@ class FinanceRepository extends BaseRepository
 
 
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()