lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
YunaiV 2024-01-22 21:09:45 +08:00
commit 6898c17adf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
View File

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

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java
View File

@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
public class NoticeSaveReqVO { public class NoticeSaveReqVO {
@Schema(description = "岗位公告编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @Schema(description = "岗位公告编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "岗位公告编号不能为空") // @NotNull(message = "岗位公告编号不能为空")
private Long id; private Long id;
@Schema(description = "公告标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "小博主") @Schema(description = "公告标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "小博主")