Merge branch 'feature/family' into feature/3.5

cv/group_power_cv/group_rank.go

@@ -9,6 +9,7 @@ import (
 type CvGroupPowerInfo struct {
 	CvGroupPowerBase   `json:",inline"`
 	CvGroupPowerMember `json:",inline"`
+	CvGroupPowerGrade  `json:",inline"`
 }
 
 // 家族基本信息

route/group_power_r/inner.go

@@ -65,6 +65,10 @@ func MGetGroupPowers(c *gin.Context) (*mycontext.MyContext, error) {
 				MemberNum: memberNum,
 				MemberMax: memberMax,
 			},
+			CvGroupPowerGrade: group_power_cv.CvGroupPowerGrade{
+				Grade: grade,
+				Exp:   groupPowerGrade[groupPowerId].Exp,
+			},
 		}
 	}
 	resp.ResponseOk(c, response)