Merge remote-tracking branch 'origin/master'

yz

2021-03-05 749ad6fe2e845433622992aa0aacd8b0d7714ccc

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDeptService.java

@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * name: IRemoteDeptService
 * package: cc.mrbird.febs.server.hr.feign
@@ -23,6 +25,12 @@
 */
@FeignClient(value = FebsServerConstant.FEBS_SERVER_SYSTEM, contextId = "deptServiceClient", fallbackFactory = RemoteDeptServiceFallback.class)
public interface IRemoteDeptService {
    // @GetMapping("dept")
    // FebsResponse deptList(@RequestParam("queryRequest") QueryRequest queryRequest, @RequestParam("dept") Dept depts);

    @GetMapping("dept")
    FebsResponse deptList(@RequestParam("queryRequest") QueryRequest queryRequest, @RequestParam("dept") Dept depts);
    List<Dept> selectAllDept(Dept dept);
    
    @GetMapping("dept/userRightDepts")
    String userRightDepts();
}