修复 ProjectMemberController 的合并冲突并完成修改
This commit is contained in:
parent
e1259d904a
commit
32d43e5a3b
|
@ -1,14 +1,16 @@
|
||||||
package com.dite.znpt.web.controller;
|
package com.dite.znpt.web.controller;
|
||||||
|
|
||||||
import com.dite.znpt.domain.Result;
|
import com.dite.znpt.domain.Result;
|
||||||
import com.dite.znpt.domain.Result;
|
|
||||||
import com.dite.znpt.domain.vo.ProjectKanbanStatsResp;
|
|
||||||
import com.dite.znpt.domain.vo.ProjectKanbanDataResp;
|
|
||||||
import com.dite.znpt.domain.vo.ProjectDetailResp;
|
import com.dite.znpt.domain.vo.ProjectDetailResp;
|
||||||
|
import com.dite.znpt.domain.vo.ProjectKanbanDataResp;
|
||||||
|
import com.dite.znpt.domain.vo.ProjectKanbanStatsResp;
|
||||||
import com.dite.znpt.service.ProjectMemberService;
|
import com.dite.znpt.service.ProjectMemberService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue