luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jhc' into dev

Browse Source
This commit is contained in:
jhc 2023-04-25 15:25:47 +08:00
commit e3e93400cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/m/msg.go
View File

@ -1,7 +1,7 @@
package m
const (
SERVER_CONFIG = "../conf/conf.ini"
SERVER_CONFIG = "./conf/conf.ini"
)
const (

4
pkg/serializer/approval.go
View File

@ -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-待阅读