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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxController.java

@@ -49,7 +49,6 @@
    */
   @GetMapping(value = "/page")
   public R queryPageList(ProjectSearchDTO searchDTO, Query query) {

      IPage<SgGxVO> page = sgGxService.queryPageList(Condition.getPage(query), searchDTO);
      return R.data(page);
   }
@@ -63,4 +62,13 @@
      SgGxVO sgGxDO = sgGxService.detail(id);
      return R.data(sgGxDO);
   }

   /**
    * 删除
    */
   @GetMapping(value = "/delete")
   public R delete(Long id) {
       sgGxService.delete(id);
      return R.success("删除成功");
   }
}