Merge branch 'jhc' into dev

pkg/model/approval.go

@@ -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"`
-	FinancialForm     *FinancialForm        `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
+	FinancialForm     *FinancialForm        `gorm:"foreignKey:ApprovalID" json:"financialForm"`
 }
 
 func (j *KeyInfos) Scan(src interface{}) error {