Merge branch 'refs/heads/dev-对账管理' into dev-test

src/main/resources/mapper/goods/GoodsShopMapper.xml

@@ -191,7 +191,7 @@
             tb_order tor
             left join goods_shop gs on tor.shop_id = gs.shop_id
         where
-            tor.status = 4
+            tor.status in (3, 4, 6, 7)
             <if test="shopId != null">
                 and tor.shop_id = #{shopId}
             </if>