瀏覽代碼

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

yjwang 1 周之前
父節點
當前提交
ef7e75f37f
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

+ 2 - 2
fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1590,8 +1590,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         </if>
 
-        inner join fs_store_order_item_scrm oi on o.id = oi.order_id
-        inner join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
+        left join fs_store_order_item_scrm oi on o.id = oi.order_id
+        left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
 
         LEFT JOIN (
         SELECT