解决冲突

This commit is contained in:
yangsong 2023-09-28 16:32:52 +08:00
parent a80829bbda
commit 21a4c23d78

View File

@ -1,13 +1,21 @@
package cn.axzo.tyr.server.controller.permission;
import java.util.Objects;
import org.springframework.web.bind.annotation.RestController;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.framework.auth.annotation.PreBuildContext;
import cn.axzo.framework.auth.domain.ContextInfoHolder;
import cn.axzo.framework.auth.domain.UserInfo;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.feign.PermissionPointApplyApi;
import cn.axzo.tyr.client.model.vo.BindWorkflowInstantceVO;
import cn.axzo.tyr.client.model.vo.PermissionPointApplyVO;
import cn.axzo.tyr.client.model.vo.SubmitPermissionPointApplyVO;
import cn.axzo.tyr.client.model.vo.UpdatePermissionPointApplyVO;
import cn.axzo.tyr.client.model.enums.PermissionPointApplyStatus;
import cn.axzo.tyr.client.model.permission.PermissionPointApplyDetailResp;
import cn.axzo.tyr.client.model.permission.PermissionPointApplyDetailUpdateReq;
import cn.axzo.tyr.client.model.req.GetWorkflowQueryAndUpdatePermissionReq;
import cn.axzo.tyr.client.model.res.GetWorkflowQueryAndUpdatePermissionRes;
import cn.axzo.tyr.client.model.vo.*;
import cn.axzo.tyr.server.controller.dataPermission.DataPermissionController;
import cn.axzo.tyr.server.service.SaasFeatureApplyDetailService;
import cn.axzo.tyr.server.service.SaasFeatureApplyService;