diff --git a/model/report.go b/model/report.go index aa87b0b..d4961be 100644 --- a/model/report.go +++ b/model/report.go @@ -78,9 +78,9 @@ func (ReportIndexSimplified) TableName() string { } type JoinedReportForWithdraw struct { - Report ReportIndexSimplified `xorm:"extends" json:"report"` - Park ParkSimplified `xorm:"extends" json:"park"` - User UserDetailSimplified `xorm:"extends" json:"user"` + Report Report `xorm:"extends" json:"report"` + Park ParkSimplified `xorm:"extends" json:"park"` + User UserDetailSimplified `xorm:"extends" json:"user"` } func (JoinedReportForWithdraw) TableName() string { diff --git a/model/user_detail.go b/model/user_detail.go index 74e555a..1aa461a 100644 --- a/model/user_detail.go +++ b/model/user_detail.go @@ -46,7 +46,7 @@ func (FullJoinedUserDetail) TableName() string { } type UserDetailSimplified struct { - Id string `xorm:"varchar(120) pk not null" json:"-"` + Id string `xorm:"varchar(120) pk not null" json:"id"` Name *string `xorm:"varchar(100)" json:"name"` Abbr *string `xorm:"varchar(50)" json:"abbr"` Region *string `xorm:"varchar(10)" json:"region"`