名称调整

yanghb

2023-04-04 82c12a0e90b4c71514595420749c63b25f73f52a

 ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java

@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.response.MerchantActivityVo;
import com.stylefeng.guns.modular.system.service.*;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;