海恒-鸿瑞堂
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
jiangqs
2023-06-27 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5 
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java


@@ -12,15 +12,14 @@


import com.ruoyi.shop.service.task.AgencyTaskService;


import com.ruoyi.shop.service.task.MemberTaskRecordService;


import com.ruoyi.shop.service.task.MemberTaskService;


import com.ruoyi.system.api.domain.poji.member.Member;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestMethod;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import java.util.List;




/**


@@ -35,16 +34,16 @@


@RequestMapping("/mer/task")


public class MerTaskController {




    @Autowired


    @Resource


    private MemberTaskService memberTaskService;




    @Autowired


    @Resource


    private MemberTaskRecordService memberTaskRecordService;




    @Autowired


    @Resource


    private AgencyTaskService agencyTaskService;




    @Autowired


    @Resource


    private AgencyTaskRecordService agencyTaskRecordService;




    @RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)