Skip to content

H
hilo-group
Commit 37768a2f authored by hujiebin's avatar hujiebin
Browse files
Options

Merge branch 'feature/family' into feature/3.5

parents 96cb5dc3 5c94367b
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cv/group_power_cv/group_rank.go
View file @ 37768a2f
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
type CvGroupPowerInfo struct { type CvGroupPowerInfo struct {
CvGroupPowerBase `json:",inline"` CvGroupPowerBase `json:",inline"`
CvGroupPowerMember `json:",inline"` CvGroupPowerMember `json:",inline"`
CvGroupPowerGrade `json:",inline"`
} }
// 家族基本信息 // 家族基本信息
......
route/group_power_r/inner.go
View file @ 37768a2f
...@@ -65,6 +65,10 @@ func MGetGroupPowers(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -65,6 +65,10 @@ func MGetGroupPowers(c *gin.Context) (*mycontext.MyContext, error) {
MemberNum: memberNum, MemberNum: memberNum,
MemberMax: memberMax, MemberMax: memberMax,
}, },
CvGroupPowerGrade: group_power_cv.CvGroupPowerGrade{
Grade: grade,
Exp: groupPowerGrade[groupPowerId].Exp,
},
} }
} }
resp.ResponseOk(c, response) resp.ResponseOk(c, response)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment