From 5a8ae920dace571fbf0858f48354d3bc697e6340 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 09 十一月 2022 18:02:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7ba6a71..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
@@ -16,13 +16,13 @@
@Override
public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
- String Name,List<String> ids) {
- return baseMapper.selectConfigList(page,state,Name, ids);
+ String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(page,state,Name, ids,userId);
}
@Override
- public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids) {
- return baseMapper.selectConfigList(Name,ids);
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(Name,ids,userId);
}
@Override
--
Gitblit v1.7.1