diff --git a/pkg/m/msg.go b/pkg/m/msg.go index fda572a..1b70019 100644 --- a/pkg/m/msg.go +++ b/pkg/m/msg.go @@ -1,7 +1,7 @@ package m const ( - SERVER_CONFIG = "../conf/conf.ini" + SERVER_CONFIG = "./conf/conf.ini" ) const ( diff --git a/pkg/serializer/approval.go b/pkg/serializer/approval.go index 07f3c68..746283e 100644 --- a/pkg/serializer/approval.go +++ b/pkg/serializer/approval.go @@ -13,7 +13,7 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques var exhibition *approval.Exhibition var bundle *approval.Bundle var workFlows []*approval.WorkFlow - var financialFrom *approval.FinancialFrom + var financialForm *approval.FinancialForm canViewed := false canApproval := false allStatus := uint64(entity.Status) @@ -72,7 +72,7 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques Show: show, Exhibition: exhibition, Bundle: bundle, - FinancialFrom: financialFrom, + FinancialForm: financialForm, CustomizeInfo: BuildKeyInfo(entity.ValueJson), CreatedAt: entity.CreatedAt.Format("2006-01-02 15:04:05"), AllStatus: allStatus, //0-未处理 1-通过 2-拒绝 3-已阅读 4-待阅读