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

xuhy

7 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -24,6 +24,11 @@
         }
         
         @Override
         public R<Operator> getOperatorByName(String name) {
            return R.fail("获取运营商数据失败：" + cause.getMessage());
         }
			
         @Override
         public R<Operator> getOperator(String operatorId) {
            return R.fail("获取运营商数据失败：" + cause.getMessage());
         }