Merge branch 'jhc' into dev

This commit is contained in:
jhc 2023-04-25 11:46:13 +08:00
commit 9846c33fd1

View File

@ -51,7 +51,7 @@ type Approval struct {
BundlePayPrice *BundlePayPrice `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"` //关联的type
ExhibitionReward *ExhibitionReward `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
ApprovalWorkFlows []*ApprovalWorkFlow `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
FinancialFrom []*FinancialFrom `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
FinancialFrom *FinancialFrom `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
}
func (j *KeyInfos) Scan(src interface{}) error {