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

xuhy

6 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/GoodsFallbackFactory.java

@@ -36,7 +36,7 @@
         
         @Override
         public R updateGoods(TGoods goods) {
            throw new RuntimeException("修改商品异常");
            return R.fail("修改商品异常");
         }
      };
   }