Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -547,7 +547,7 @@
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
                    OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
             OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
-          AND po.status = '已发货'
+          AND po.status in ('已发货','已收货')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') >= DATE_FORMAT(#{statusDate},'%Y-%m')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') <= DATE_FORMAT(#{endDate},'%Y-%m')
         GROUP BY