Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

 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