Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3319,7 +3319,7 @@
     </select>
 
     <sql id="getSaleProfitInOutBound">
-        sum(coalesce(tpoi.fact_amt, 0) - coalesce(tpoi.return_amt, 0)) outbound,
+        sum(coalesce(tpoi.fact_amt, 0)) outbound,
         sum(coalesce(tpoi.cost_amt, 0)) inbound
     </sql>