Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro into feature/tenant_op

 Conflicts:
	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
This commit is contained in:
YunaiV
2022-02-27 02:13:06 +08:00
13 changed files with 16 additions and 15 deletions

View File

@ -23,7 +23,7 @@ public interface FileMapper extends BaseMapperX<FileDO> {
.orderByDesc("create_time"));
}
default Integer selectCountById(String id) {
default Long selectCountById(String id) {
return selectCount(FileDO::getId, id);
}