conflict-feat-20240112-001-main #69

Merged
chenhao merged 8 commits from conflict-feat-20240112-001-main into main 2024-01-23 18:02:57 +08:00
2 changed files with 4 additions and 0 deletions
Showing only changes of commit 9c42b763d8 - Show all commits

View File

@ -16,6 +16,7 @@ type ApiListVO struct {
GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量
DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量
WithdrawDiamondNum *int64 `json:"withdraw_diamond_num" bson:"withdraw_diamond_num"` // 提现钻石数量
IsAMember *int64 `json:"is_a_member" bson:"is_a_member"` // 是否会员
Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间
}
@ -45,6 +46,7 @@ func (vo *ApiListVO) CopyAccount(account *dbstruct.Account) *ApiListVO {
vo.IsDndModeEnabled = account.IsDndModeEnabled
vo.GoldNum = account.GoldNum
vo.DiamondNum = account.DiamondNum
vo.IsAMember = account.IsAMember
vo.Ct = account.Ct
vo.Ut = account.Ut
return vo

View File

@ -15,6 +15,7 @@ type OpListVO struct {
IsDndModeEnabled *int64 `json:"is_dnd_mode_enabled" bson:"is_dnd_mode_enabled"` // 是否开启勿扰模式
GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量
DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量
IsAMember *int64 `json:"is_a_member" bson:"is_a_member"` // 是否会员
Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间
}
@ -44,6 +45,7 @@ func (vo *OpListVO) CopyAccount(account *dbstruct.Account) *OpListVO {
vo.IsDndModeEnabled = account.IsDndModeEnabled
vo.GoldNum = account.GoldNum
vo.DiamondNum = account.DiamondNum
vo.IsAMember = account.IsAMember
vo.Ct = account.Ct
vo.Ut = account.Ut
return vo