|
|
@@ -32,8 +32,6 @@ type OilContractReviewVo struct {
|
|
|
BusinessKey string `json:"BusinessKey" xorm:"comment('流程序号') VARCHAR(255) 'BusinessKey'"`
|
|
|
ProcessKey string `json:"ProcessKey" xorm:"comment('工作流名称') VARCHAR(255) 'ProcessKey'"`
|
|
|
BackRemark string `json:"BackRemark" xorm:"comment('退回原因') VARCHAR(255) 'BackRemark'"`
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
FirstAudit int `xorm:"default 0 comment('初审') INT(10)"`
|
|
|
SecondAudit int `xorm:"default 0 comment('复审') INT(10)"`
|
|
|
ThirdAudit int `xorm:"default 0 comment('专业科室审批') INT(10)"`
|
|
|
@@ -46,7 +44,6 @@ type OilContractReviewVo struct {
|
|
|
ModifiedOn time.Time `json:"ModifiedOn" xorm:"DATETIME 'ModifiedOn'"`
|
|
|
ModifiedUserId int `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
|
|
|
ModifiedBy string `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
|
|
|
->>>>>>> 93673b4d2cfb6bd2fce8793937650a44cab1f36a
|
|
|
}
|
|
|
type OilContractEvaluationItemsVo struct{
|
|
|
Id int `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
|
Yikoo