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

zhibing.pu

2024-06-21 a5c2c7e633e0dba4b80c8a15fd34c38ae097befc

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount1Service.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.service.IService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;

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

/**
@@ -62,4 +63,12 @@
     * @throws Exception
     */
    HSSFWorkbook downloadDiscountInfo(String name, String time, Integer companyId) throws Exception;


    /**
     * 发送活动提醒邮件
     */
    void sendActivityEmail();

    void sendEmail(List<UserActivityDiscount1> list)throws Exception;
}