From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

---
 src/main/java/cc/mrbird/febs/generator/service/impl/GeneratorConfigServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/generator/service/impl/GeneratorConfigServiceImpl.java b/src/main/java/cc/mrbird/febs/generator/service/impl/GeneratorConfigServiceImpl.java
index de682c1..777900c 100644
--- a/src/main/java/cc/mrbird/febs/generator/service/impl/GeneratorConfigServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/generator/service/impl/GeneratorConfigServiceImpl.java
@@ -4,7 +4,7 @@
 import cc.mrbird.febs.generator.mapper.GeneratorConfigMapper;
 import cc.mrbird.febs.generator.service.IGeneratorConfigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

--
Gitblit v1.9.1