Merge remote-tracking branch 'origin/master' into matser

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

@@ -857,9 +857,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         company_user cu
         INNER JOIN company c ON cu.company_id = c.company_id
         LEFT JOIN fs_store_order_scrm fso ON cu.user_id = fso.company_user_id
-        INNER JOIN fs_store_order_item_scrm fsoi ON fso.id = fsoi.order_id
-        INNER JOIN fs_store_product_scrm fsp ON fsoi.product_id = fsp.product_id
-        INNER JOIN fs_store_product_category_scrm fspc ON fspc.cate_id = fsp.cate_id
+--         INNER JOIN fs_store_order_item_scrm fsoi ON fso.id = fsoi.order_id
+--         INNER JOIN fs_store_product_scrm fsp ON fsoi.product_id = fsp.product_id
+--         INNER JOIN fs_store_product_category_scrm fspc ON fspc.cate_id = fsp.cate_id
         WHERE
         fso.is_del = '0'
         AND fso.`status` != 0