style: _

go.mod

@@ -2,6 +2,8 @@ module git.i2edu.net/i2/i2-bill-api
 
 go 1.16
 
+// replace git.i2edu.net/i2/i2-bill-erp => ../i2-bill-erp
+
 require (
 	git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f
 	git.i2edu.net/i2/i2-bill-erp v0.0.0-20210623022310-19bfc0a41451

i2bill.api

@@ -88,6 +88,7 @@ type infoResponse {
 	ID          int64  `json:"id"`
 	Mobile      string `json:"mobile"`
 	UserName    string `json:"username"`
+	CityName    string `json:"cityname"`
 	NickName    string `json:"nickname"`
 	Gender      int64  `json:"gender"`
 	Avatar      string `json:"avatar"`

internal/logic/user/getuserlogic.go

@@ -45,10 +45,11 @@ func (l *GetUserLogic) GetUser() (*types.InfoResponse, error) {
 	info.ID = user.Id
 	info.Avatar = user.Avatar
 	info.Birthday = user.Birthday
-	info.UserName = user.Username
 	info.NickName = user.Nickname
-	info.Gender = user.Gender
 	info.Mobile = user.Mobile
+	info.UserName = resp.UserName
+	info.Gender = resp.Gender
+	info.CityName = resp.CityName
 	info.ErpRoleType = resp.ErpRoleType
 	return info, nil
 }

internal/types/types.go

@@ -81,6 +81,7 @@ type InfoResponse struct {
 	ID          int64  `json:"id"`
 	Mobile      string `json:"mobile"`
 	UserName    string `json:"username"`
+	CityName    string `json:"cityname"`
 	NickName    string `json:"nickname"`
 	Gender      int64  `json:"gender"`
 	Avatar      string `json:"avatar"`