Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-30 4bd9195ff5beeb416792b50bbaea84c56a1b500b

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TActivityGeneralizationServiceImpl.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.TActivityGeneralizationMapper;
import com.stylefeng.guns.modular.system.dao.TOrderTapeMapper;
@@ -8,6 +9,9 @@
import com.stylefeng.guns.modular.system.service.ITActivityGeneralizationService;
import com.stylefeng.guns.modular.system.service.ITOrderTapeService;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -20,4 +24,10 @@
@Service
public class TActivityGeneralizationServiceImpl extends ServiceImpl<TActivityGeneralizationMapper, TActivityGeneralization> implements ITActivityGeneralizationService {

    @Override
    public List<Map<String, Object>> getList(Page<Map<String, Object>> page,
                                             String beginTime, String endTime,
                                             String activityName, Integer state) {
        return this.baseMapper.getList(page,beginTime,endTime,activityName,state);
    }
}