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

xuhy

3 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java

@@ -47,7 +47,7 @@

            @Override
            public R<Integer> getSalesCountByGoodsIdgetCount(Integer goodId, Integer goodeType, Integer buyType) {
                return null;
                return R.fail("获取数据失败：" + cause.getMessage());
            }


@@ -68,7 +68,7 @@

            @Override
            public R<Long> addVipOrder(TVipOrder vipOrder) {
                return null;
                return R.fail("获取数据失败：" + cause.getMessage());
            }