Merge branch 'tag_func' into pre

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -358,7 +358,7 @@
         select joinTime                               as `date`,
                count(DISTINCT corpUserId)             as numOfUser,
                count(if(status != 'refund', 1, NULL)) as numOfOrder,
-               (ifnull(sum(money), 0) - sum(ifnull(refund_money, 0))) / 100
+               (ifnull(sum(money), 0) - sum(ifnull(refund_money, 0))) / 100 as orderMoney
         from (select cu.id as                                corpUserId,
                      cu.user_id,
                      date_format(s.created_time, '%Y-%m-%d') joinTime