From afaadcfef9aa4213533d2055e77ce2a69fe087f1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 14:01:02 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
index a8f0f32..e2644ea 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
@@ -15,13 +15,14 @@
{
@Override
- public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state, String Name) {
- return baseMapper.selectConfigList(page,state,Name);
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(page,state,Name, ids,userId);
}
@Override
- public List<ElseAccessoryEntity> selectConfigList(String Name) {
- return baseMapper.selectConfigList(Name);
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(Name,ids,userId);
}
@Override
@@ -40,7 +41,7 @@
}
@Override
- public int countNum(String Name) {
- return baseMapper.countNum(Name);
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
}
}
--
Gitblit v1.7.1