Merge branch 'new_partner_dashboard' into develop

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml

@@ -95,7 +95,7 @@
         <![CDATA[
         SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
         sum(s.old_customers) old_customers,sum(s.total) total, sum(s.total)/sum(s.customers) single_amount,
-        date_format(s.date,'%Y-%m-%d') trade_date
+        date_format(s.date,'%Y/%m/%d') trade_date
         FROM statistics_customer_order s
         LEFT JOIN sys_clients c ON  c.client_id = s.client_id and c.is_valid=1
         ]]>