Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/grid/controller/GridmanController.java

@@ -62,6 +62,14 @@
      GridmanEntity detail = gridmanService.getOne(Condition.getQueryWrapper(gridman));
      return R.data(GridmanWrapper.build().entityVO(detail));
   }

   /**
    * 网格员表 自定义详情
    */
   @GetMapping("/getDetail")
   public R<GridmanVO> getDetail(GridmanEntity gridman) {
      return R.data(gridmanService.getDetail(gridman));
   }
   /**
    * 网格员表 分页
    */
@@ -168,4 +176,5 @@
   }



}