From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001 From: zhuguifei <312353457@qq.com> Date: 星期三, 27 十一月 2024 13:45:25 +0800 Subject: [PATCH] 修复冲突 --- jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java index ce66fce..682cd8a 100644 --- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java +++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.java @@ -17,11 +17,4 @@ @Service public class DryEqpTypeServiceImpl extends ServiceImpl<DryEqpTypeMapper, DryEqpType> implements IDryEqpTypeService { - @Override - public DryEqpType selectByTenantIdTypeId(String tenantId, String id) { - LambdaQueryWrapper<DryEqpType> query = new LambdaQueryWrapper<>(); - query.eq(DryEqpType::getTenantId, tenantId); - query.eq(DryEqpType::getId, id); - return this.getOne(query); - } } -- Gitblit v1.9.3