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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/controller/LogUsualController.java

@@ -60,8 +60,8 @@
    * 查询多条(分页)
    */
   @GetMapping("/list")
   public R<IPage<LogUsual>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
      IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
   public R<IPage<LogUsual>> list(@ApiIgnore LogUsual log, Query query) {
      IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log));
      return R.data(pages);
   }