作者 tangxuhui

数据结构调整

@@ -84,6 +84,8 @@ type CooperationApplicationItem struct { @@ -84,6 +84,8 @@ type CooperationApplicationItem struct {
84 Org domain.Org `json:"org"` 84 Org domain.Org `json:"org"`
85 UserBaseID int `json:"userBaseId,string"` 85 UserBaseID int `json:"userBaseId,string"`
86 UserID int `json:"userId,string"` 86 UserID int `json:"userId,string"`
  87 + UserName string `json:"userName"`
  88 + UserCode string `json:"userCode"`
87 UserInfo domain.UserInfo `json:"userInfo"` 89 UserInfo domain.UserInfo `json:"userInfo"`
88 UserType int `json:"userType"` 90 UserType int `json:"userType"`
89 } `json:"cooperationApplicationApplicant"` //申请人 91 } `json:"cooperationApplicationApplicant"` //申请人
@@ -113,6 +115,8 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation @@ -113,6 +115,8 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation
113 data.CooperationApplicationApplicant.Org.OrgID = param.Org.OrgID 115 data.CooperationApplicationApplicant.Org.OrgID = param.Org.OrgID
114 data.CooperationApplicationApplicant.Org.OrgName = param.Org.OrgName 116 data.CooperationApplicationApplicant.Org.OrgName = param.Org.OrgName
115 data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID 117 data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID
  118 + data.CooperationApplicationApplicant.UserName = param.CooperationApplicationApplicant.UserInfo.UserName
  119 + data.CooperationApplicationApplicant.UserCode = param.CooperationApplicationApplicant.UserInfo.UserCode
116 //data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant. 120 //data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant.
117 data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone 121 data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone
118 data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName 122 data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName