Merge branch 'feature/family' into feature/3.5

cv/group_power_cv/group_rank.go

@@ -30,7 +30,7 @@ type CvGroupPowerMember struct {
 type CvGroupPowerGrade struct {
 	Grade    groupPower_e.GroupPowerGrade `json:"grade"`              // 等级 0:青铜 1:白银 2:黄金 3:黑金
 	Exp      uint32                       `json:"exp"`                // 经验值
-	NextExp  uint32                       `json:"nextExp,omitempty"`  // 升级所需经验值
+	NextExp  uint32                       `json:"nextExp,omitempty"`  // 下个等级所需经验值
 	ExpireAt string                       `json:"expireAt,omitempty"` // 有效期
 }
 

route/group_power_r/group_rank.go

@@ -198,7 +198,7 @@ func GroupPowerGradeDetail(c *gin.Context) (*mycontext.MyContext, error) {
 	grade := gradeM[groupPowerId]
 	nextExp := mysql.Num(0)
 	if grade.Grade != groupPower_e.GroupPowerGradeMax {
-		nextExp = groupPower_e.GroupPowerGradeExp[grade.Grade+1] - groupPower_e.GroupPowerGradeExp[grade.Grade]
+		nextExp = groupPower_e.GroupPowerGradeExp[grade.Grade+1]
 	}
 	expireAt := ""
 	if grade.ExpireAt.After(time.Now()) {