Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/controller/admin/DlBaseNoticeController.java

@@ -75,7 +75,7 @@ public class DlBaseNoticeController {
         return CommonResult.ok();
     }
 
-    @GetMapping("get")
+    @GetMapping("/get")
     @Operation(summary = "平台通用信息公告 查询 按服务")
     public CommonResult<?> getNoticeById(@RequestParam("id") String id) {
         return success(dlBaseNoticeService.getById(id));

dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/entity/DlBaseNotice.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.notice.entity;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -16,7 +17,7 @@ import lombok.EqualsAndHashCode;
 @TableName(value ="dl_base_notice")
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DlBaseNotice extends TenantBaseDO {
+public class DlBaseNotice extends BaseDO {
     /**
      * 公告ID
      */

yudao-server/src/main/resources/application.yaml

@@ -296,6 +296,7 @@ yudao:
       - /admin-api/rescue/driverLogin
       - /admin-api/rescuePayApi/payNotify
       - /admin-api/payApi/payNotify
+      - /admin-api/base/notice/**
 
     ignore-tables:
       - system_tenant
@@ -342,6 +343,7 @@ yudao:
       - tmp_report_data_1
       - tmp_report_data_income
       - system_users
+      - dl_base_notice
     ignore-caches:
       - permission_menu_ids
       - oauth_client