Merge remote-tracking branch 'origin/master'

puzhibing

2025-06-05 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/dao/UPWarnMsgAdptInfoDao.java

@@ -20,7 +20,7 @@
    * @param result
    * @return
    */
   List<UPWarnMsgAdptInfo> findByResultIsAndPushTimeBefore(int result, long pushTime);
   List<UPWarnMsgAdptInfo> findByResultIsAndLevelNotNullAndPushTimeBefore(int result, long pushTime);
   
   
   /**
@@ -38,6 +38,6 @@
    * @param infoId
    * @return
    */
   UPWarnMsgAdptInfo findByInfoIdIs(Integer infoId);
   UPWarnMsgAdptInfo findByInfoIdIs(String infoId);
   
}