zhangxinlei1996 1 year ago
parent
commit
66cfb7f489
1 changed files with 0 additions and 3 deletions
  1. 0 3
      ent/entity/user.go

+ 0 - 3
ent/entity/user.go

@@ -31,12 +31,9 @@ type User struct {
 	Dept_name string //部门名称
 	Role      string //角色
 	Power     int    //权限
-<<<<<<< HEAD
 	NicheDis  int    //商机分配权限
 	Role_id   int
-=======
 	User_name string
->>>>>>> feature/v1.0.3
 }
 
 type CompletionUserInfo struct {