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

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.xml

@@ -93,6 +93,7 @@
     <select id="getMerchantOrder" resultType="org.springblade.modules.finance.vo.MerchantPageOrderVO">
         SELECT
             og.*,
+            o.image,
             o.order_state,
             o.is_aftersales
         FROM