From b6d8c8f54a3c995941bb1a2b3869a06e43110a53 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 7 Nov 2018 16:17:24 +0800 Subject: [PATCH] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java --- .../java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java index c82b169..f3ee1e4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import io.swagger.annotations.ApiOperation; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,9 +20,9 @@ import java.util.List; public interface IOrganizeService { /** - * 修改数据 * @param organize */ + @ApiOperation(value = "更新组织",notes = "传入持久化组织对象,进行更新") void updateOrganize(Organize organize); /** @@ -30,6 +31,7 @@ public interface IOrganizeService { * @param status 组织状态 * @param user 当前会话用户 */ + @ApiOperation(value = "修改组织状态",notes = "") void updateOrganizeStatus(String id, int status, SessionUser user); /**