Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java

@@ -332,7 +332,7 @@ public class SysDepartmentController extends CrudBaseController<SysDepartment> {
 
     @GetMapping(value = "/cloud-query-department/{departmentCode}")
     @ApiOperation(value = "微服务查询部门", notes = "等值查询部门code")
-    public ResultBean queryPagerByCloud(@PathVariable String departmentCode) {
+    public ResultBean<SysDepartment> queryPagerByCloud(@PathVariable String departmentCode) {
         SessionUser sessionUser = getSessionUser();
         SysUser sysUser = personnelService.getSysUserById(sessionUser.getUserId());
         Long organizeId = sysUser.getOrganizeId();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java

@@ -125,7 +125,7 @@ public class SysPositionController extends CrudBaseController<SysPosition> {
 
     @ApiOperation(value = "微服务查询岗位", notes = "微服务根据岗位代码等值查询岗位")
     @GetMapping("/cloud-query/{positionCode}")
-    public ResultBean findPositionByCode(@PathVariable String positionCode) {
+    public ResultBean<SysPosition> findPositionByCode(@PathVariable String positionCode) {
         String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
         try {
             SysPosition sysPosition = positionService.findPositionByPositionCodeAndOrganizeId(positionCode, organizeCode);