Merge remote-tracking branch 'origin/master'

puzhibing

2025-06-05 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6

 ruoyi-api/ruoyi-api-dataInterchange/src/main/java/com/ruoyi/dataInterchange/api/factory/UPWarnMsgAdptInfoClientFallbackFactory.java

@@ -22,7 +22,7 @@
         }
         
         @Override
         public R<UPWarnMsgAdptInfoVo> findByInfoId(Integer infoId) {
         public R<UPWarnMsgAdptInfoVo> findByInfoId(String infoId) {
            return R.fail("根据信息id查询报警原始数据失败：" + cause.getMessage());
         }
      };