lanjianrong 4 years ago
parent
commit
25be488a2e
1 changed files with 0 additions and 3 deletions
  1. 0 3
      services/project_account_service.go

+ 0 - 3
services/project_account_service.go

@@ -32,10 +32,7 @@ type ProjectAccountService interface {
 	ValidRulePermission(ctx iris.Context) (viewmodels.Permission, error)
 	ValidRuleAccount(ctx iris.Context) (viewmodels.ProjectAccount, error)
 	ValidGetPermission(ctx iris.Context) (viewmodels.Permission, error)
-<<<<<<< Updated upstream
 	ValidRuleProjectId(ctx iris.Context) (viewmodels.ProjectAccount, error)
-=======
->>>>>>> Stashed changes
 	Get(accountId int, projectId int) *viewmodels.ProjectAccount
 	GetAll(projectId int) []viewmodels.ProjectAccount
 	GetBidAccount(bidsectionId int, projectId int, projectAccountId int, name string) []viewmodels.ProjectAccount