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

xuhy

2025-06-25 6ecf7171775a04bbcb52c9943bcafce699c837a7

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java

@@ -47,7 +47,7 @@
   }
   
   public static BaseResponse ok(){
      return ok(new Object());
      return ok(null);
   }