feat:冲突

api/internal/types/types.go

@@ -236,8 +236,7 @@ type UserDelReq struct {
 }
 
 type WorkDesktopMenuInfoReq struct {
-<<<<<<< HEAD
-	Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
+	Platform     string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 	UserId       string `header:"userId"`
 	AppId        string `header:"appId"`
 	Phone        string `header:"phone,optional"`
@@ -253,7 +252,7 @@ type WorkDesktopMenuInfoReq struct {
 }
 
 type WorkDesktopComprehensiveReq struct {
-	Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
+	Platform     string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 	UserId       string `header:"userId"`
 	AppId        string `header:"appId"`
 	Phone        string `header:"phone,optional"`
@@ -268,28 +267,6 @@ type WorkDesktopComprehensiveReq struct {
 	PositionType string `header:"positionType,optional"` //职位类型 0个人 1企业
 	PositionId   string `header:"positionId,optional"`   //职位id
 	MgoUserId    string `header:"mgoUserId,optional"`    //原userId
-=======
-	Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-	UserId    string `header:"userId"`
-	AppId     string `header:"appId"`
-	Phone     string `header:"phone,optional"`
-	NewUserId string `header:"newUserId"` //base_user_id<---base_user
-	EntId     int64  `header:"entId,optional"`
-	EntUserId int64  `header:"entUserId,optional"`
-}
-
-type WorkDesktopComprehensiveReq struct {
-	Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-	UserId     string `header:"userId"`
-	AppId      string `header:"appId"`
-	Phone      string `header:"phone,optional"`
-	MenuMode   string `json:"menuMode,optional"`
-	MenuIds    string `json:"menuIds,optional"`
-	ActionMode string `path:"actionMode,options=commonlyRenew|commonlyList|menuMode"`
-	NewUserId  string `header:"newUserId"`
-	EntId      int64  `header:"entId,optional"`
-	EntUserId  int64  `header:"entUserId,optional"`
->>>>>>> master
 }
 
 type CommonResp struct {
@@ -299,18 +276,10 @@ type CommonResp struct {
 }
 
 type WorkDesktopClearUserInfo struct {
-<<<<<<< HEAD
-	Platform   string `json:"platform,default=PC,options=PC|WX|APP"`
-	UserId     string `header:"userId"`
+	Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 	PositionId string `header:"positionId,optional"` //职位id
+	UserId     string `header:"userId"`
 	AppId      string `header:"appId"`
-=======
-	Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-	UserId    string `header:"userId"`
-	AppId     string `header:"appId"`
-	UserIds   string `json:"userIds,optional"`
-	NewUserId string `header:"newUserId"`
->>>>>>> master
 }
 
 type UserIdentityReq struct {

api/userCenter.api

@@ -250,8 +250,7 @@ type (
 
 	//工作桌面 -- 菜单
 	WorkDesktopMenuInfoReq {
-<<<<<<< HEAD
-		Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
+		Platform     string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 		UserId       string `header:"userId"`
 		AppId        string `header:"appId"`
 		Phone        string `header:"phone,optional"`
@@ -264,21 +263,11 @@ type (
 		PositionId   string `header:"positionId,optional"`   //职位id
 		WorkStatus   int64  `json:"workStatus,optional"`     //服务是否可用；1:内网可用；-1：不可用
 		MgoUserId    string `header:"mgoUserId,optional"`    //原userId
-=======
-		Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-		UserId    string `header:"userId"`
-		AppId     string `header:"appId"`
-		Phone     string `header:"phone,optional"`
-		NewUserId string `header:"newUserId"` //base_user_id<---base_user
-		EntId     int64  `header:"entId,optional"`
-		EntUserId int64  `header:"entUserId,optional"`
->>>>>>> master
 	}
 	//工作桌面-- 菜单模式：全部/可用选择记录
 	//工作桌面--常用功能更新
 	WorkDesktopComprehensiveReq {
-<<<<<<< HEAD
-		Platform     string `json:"platform,default=PC,options=PC|WX|APP"`
+		Platform     string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 		UserId       string `header:"userId"`
 		AppId        string `header:"appId"`
 		Phone        string `header:"phone,optional"`
@@ -293,18 +282,6 @@ type (
 		PositionType string `header:"positionType,optional"` //职位类型 0个人 1企业
 		PositionId   string `header:"positionId,optional"`   //职位id
 		MgoUserId    string `header:"mgoUserId,optional"`    //原userId
-=======
-		Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-		UserId     string `header:"userId"`
-		AppId      string `header:"appId"`
-		Phone      string `header:"phone,optional"`
-		MenuMode   string `json:"menuMode,optional"`
-		MenuIds    string `json:"menuIds,optional"`
-		ActionMode string `path:"actionMode,options=commonlyRenew|commonlyList|menuMode"`
-		NewUserId  string `header:"newUserId"`
-		EntId      int64  `header:"entId,optional"`
-		EntUserId  int64  `header:"entUserId,optional"`
->>>>>>> master
 	}
 	//
 	CommonResp {
@@ -314,18 +291,10 @@ type (
 	}
 	//工作桌面清用户内存信息
 	WorkDesktopClearUserInfo {
-<<<<<<< HEAD
-		Platform   string `json:"platform,default=PC,options=PC|WX|APP"`
-		UserId     string `header:"userId"`
+		Platform   string `json:"platform,default=PC,options=PC|WX|APP|H5"`
 		PositionId string `header:"positionId,optional"` //职位id
+		UserId     string `header:"userId"`
 		AppId      string `header:"appId"`
-=======
-		Platform  string `json:"platform,default=PC,options=PC|WX|APP|H5"`
-		UserId    string `header:"userId"`
-		AppId     string `header:"appId"`
-		UserIds   string `json:"userIds,optional"`
-		NewUserId string `header:"newUserId"`
->>>>>>> master
 	}
 
 	UserIdentityReq {