Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

YunaiV 1 год назад
Родитель
Сommit
6898c17adf

+ 1 - 1
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java

@@ -151,7 +151,7 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
         switch (SqlConstants.DB_TYPE) {
             case ORACLE:
             case ORACLE_12C:
-                super.eq("ROWNUM", n);
+                super.le("ROWNUM", n);
                 break;
             case SQL_SERVER:
             case SQL_SERVER2005:

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 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 = "小博主")