xg

api/internal/types/types.go

@@ -66,6 +66,7 @@ type FindInitInfoReq struct {
 	AccountId    int64  `header:"accountId,optional"`
 	PositionId   int64  `header:"positionId,optional"`
 	EntUserId    int64  `header:"entUserId,optional"`
+	EntRole      int64  `header:"entRole,optional"`
 }
 
 type InfoDetailReq struct {
@@ -191,34 +192,3 @@ type UpdateInitInfoReq struct {
 	EntName      string `header:"entName,optional"`
 	EntDeptId    int64  `header:"entDeptId,optional"`
 }
-<<<<<<< HEAD
-=======
-
-type FindInitInfoReq struct {
-	EntId        int64  `header:"entId,optional"`
-	MgoUserId    string `header:"mgoUserId,optional"` //原userId
-	PositionType int64  `header:"positionType,optional"`
-	NewUserId    int64  `header:"newUserId"`
-	AccountId    int64  `header:"accountId,optional"`
-	PositionId   int64  `header:"positionId,optional"`
-	EntUserId    int64  `header:"entUserId,optional"`
-	EntRole      int64  `header:"entRole,optional"`
-}
-
-type PrMonitorListReq struct {
-	MgoUserId  string `header:"mgoUserId,optional"`
-	PositionId int64  `header:"positionId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	PageSize   int    `json:"pageSize"`
-	PageNum    int    `json:"pageNum"`
-}
-
-type PrCollectListReq struct {
-	UserId     string `header:"userId,optional"`
-	MgoUserId  string `header:"mgoUserId,optional"`
-	PositionId int64  `header:"positionId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	PageSize   int    `json:"pageSize"`
-	PageNum    int    `json:"pageNum"`
-}
->>>>>>> 05260585a1eccbed830c78286ad364833b6bfc2b