mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts: # README.md # pom.xml # ruoyi-admin/pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java # ruoyi-admin/src/main/resources/application.yml # ruoyi-common/pom.xml # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java # ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java # ruoyi-framework/pom.xml # ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java # ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java # ruoyi-generator/pom.xml # ruoyi-job/pom.xml # ruoyi-system/pom.xml # ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java # ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml # ruoyi-ui/package.json # ruoyi-ui/src/views/index.vue
This commit is contained in:
@ -75,11 +75,11 @@ public class R<T> implements Serializable {
|
||||
return r;
|
||||
}
|
||||
|
||||
public Boolean isError() {
|
||||
return !isSuccess();
|
||||
public static <T> Boolean isError(R<T> ret) {
|
||||
return !isSuccess(ret);
|
||||
}
|
||||
|
||||
public Boolean isSuccess() {
|
||||
return R.SUCCESS == getCode();
|
||||
public static <T> Boolean isSuccess(R<T> ret) {
|
||||
return R.SUCCESS == ret.getCode();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user