Merge remote-tracking branch 'origin/master'

YunaiV · Jan 22, 2024 · 6898c17 · 6898c17
2 parents a039ab3 + 91a7e6b
commit 6898c17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...er-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java b/...er-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
@@ -151,7 +151,7 @@ public QueryWrapperX<T> limitN(int n) {
         switch (SqlConstants.DB_TYPE) {
             case ORACLE:
             case ORACLE_12C:
-                super.eq("ROWNUM", n);
+                super.le("ROWNUM", n);
                 break;
             case SQL_SERVER:
             case SQL_SERVER2005:

diff --git a/.../main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java b/.../main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java
@@ -12,7 +12,7 @@
 public class NoticeSaveReqVO {
 
     @Schema(description = "岗位公告编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "岗位公告编号不能为空")
+//    @NotNull(message = "岗位公告编号不能为空")
     private Long id;
 
     @Schema(description = "公告标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "小博主")