Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -204,6 +204,7 @@
     <select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
         select DATE_FORMAT(createTime, '%Y-%m-%d')         as date,
                ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
+               ifnull(sum(stock_total), 0)                 as stock_total,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
                ifnull(sum(stock_reserve), 0)               as stock_reserve,
@@ -259,6 +260,7 @@
     <select id="selectReport2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
         select ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
+               ifnull(sum(stock_total), 0)                 as stock_total,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
                ifnull(sum(stock_reserve), 0)               as stock_reserve,
                ifnull(sum(stock_buyout_unreserve), 0)      as stock_buyout_unreserve,
@@ -331,6 +333,7 @@
         select ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
                ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
                ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
+               ifnull(sum(stock_total), 0)                 as stock_total,
                ifnull(sum(stock_reserve), 0)               as stock_reserve,
                ifnull(sum(stock_buyout_unreserve), 0)      as stock_buyout_unreserve,
                ifnull(sum(stock_buyout_reserve), 0)        as stock_buyout_reserve,