fix(BE): merge conflict

2026-05-20 13:31:56 +00:00 · 2025-10-21 15:11:04 +07:00
parent 55b14f5fc7
commit e4799fa2dd
8 changed files with 216 additions and 117 deletions
@@ -26,4 +26,5 @@ type ProjectFlock struct {
 	CreatedUser    User                  `gorm:"foreignKey:CreatedBy;references:Id"`
 	Kandangs       []Kandang             `gorm:"foreignKey:ProjectFlockId;references:Id"`
 	KandangHistory []ProjectFlockKandang `gorm:"foreignKey:ProjectFlockId;references:Id"`
+	LatestApproval *Approval             `gorm:"-" json:"-"`
 }