Skip to content

Commit aaddedf

Browse files
author
pixel
committed
Merge branches 'gin-vue-admin_v2_dev', 'master' and 'plug' of https://github.com/piexlmax/QMPlus into plug
2 parents eab8a82 + 6104a32 commit aaddedf

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

‎server/go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ require (
1313
github.com/gin-gonic/gin v1.6.3
1414
github.com/go-openapi/spec v0.19.7 // indirect
1515
github.com/go-openapi/swag v0.19.8 // indirect
16+
github.com/go-playground/validator/v10 v10.3.0 // indirect
1617
github.com/go-redis/redis v6.15.7+incompatible
1718
github.com/go-sql-driver/mysql v1.5.0 // indirect
18-
github.com/golang/protobuf v1.3.5 // indirect
19+
github.com/golang/protobuf v1.4.2 // indirect
1920
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
2021
github.com/jinzhu/gorm v1.9.12
22+
github.com/json-iterator/go v1.1.10 // indirect
2123
github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
2224
github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
2325
github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
@@ -44,8 +46,10 @@ require (
4446
github.com/unrolled/secure v1.0.7
4547
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 // indirect
4648
golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect
47-
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
49+
golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
4850
golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
51+
google.golang.org/protobuf v1.24.0 // indirect
4952
gopkg.in/ini.v1 v1.55.0 // indirect
53+
gopkg.in/yaml.v2 v2.3.0 // indirect
5054
qiniupkg.com/x v7.0.8+incompatible // indirect
5155
)

‎server/model/sys_auto_code.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ type AutoCodeStruct struct {
55
StructName string `json:"structName"`
66
PackageName string `json:"packageName"`
77
Abbreviation string `json:"abbreviation"`
8-
Description string `json:"description"`
8+
Description string `json:"description"`
99
AutoCreateApiToSql bool `json:"autoCreateApiToSql"`
1010
Fields []Field `json:"fields"`
1111
}
1212

1313
type Field struct {
14-
FieldName string `json:"fieldName"`
15-
FieldDesc string `json:"fieldDesc"`
16-
FieldType string `json:"fieldType"`
17-
FieldJson string `json:"fieldJson"`
18-
Comment string `json:"comment"`
19-
ColumnName string `json:"columnName"`
20-
FieldSearchType string `json:"fieldSearchType"`
21-
}
14+
FieldName string `json:"fieldName"`
15+
FieldDesc string `json:"fieldDesc"`
16+
FieldType string `json:"fieldType"`
17+
FieldJson string `json:"fieldJson"`
18+
Comment string `json:"comment"`
19+
ColumnName string `json:"columnName"`
20+
FieldSearchType string `json:"fieldSearchType"`
21+
}

‎server/model/sys_user.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ type SysUser struct {
1515
Authority SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId;comment:'用户角色'"`
1616
AuthorityId string `json:"authorityId" gorm:"default:888;comment:'用户角色ID'"`
1717
}
18-

‎server/model/sys_workflow.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
// 工作流属性表
88
type SysWorkflow struct {
99
gorm.Model
10-
WorkflowNickName string `json:"workflowNickName" gorm:"comment:'工作流中文名称'"` // 工作流名称
11-
WorkflowName string `json:"workflowName" gorm:"comment:'工作流英文名称'"` // 工作流英文id
10+
WorkflowNickName string `json:"workflowNickName" gorm:"comment:'工作流中文名称'"` // 工作流名称
11+
WorkflowName string `json:"workflowName" gorm:"comment:'工作流英文名称'"` // 工作流英文id
1212
WorkflowDescription string `json:"workflowDescription" gorm:"comment:'工作流描述'"` // 工作流描述
1313
WorkflowStepInfo []SysWorkflowStepInfo `json:"workflowStep" gorm:"comment:'工作流步骤'"` // 工作流步骤
1414
}
@@ -17,9 +17,9 @@ type SysWorkflow struct {
1717
type SysWorkflowStepInfo struct {
1818
gorm.Model
1919
SysWorkflowID uint `json:"workflowID" gorm:"comment:'所属工作流ID'"` // 所属工作流ID
20-
IsStrat bool `json:"isStrat" gorm:"comment:'是否是开始流节点'"` // 是否是开始流节点
20+
IsStrat bool `json:"isStrat" gorm:"comment:'是否是开始流节点'"` // 是否是开始流节点
2121
StepName string `json:"stepName" gorm:"comment:'工作流节点名称'"` // 工作流名称
22-
StepNo float64 `json:"stepNo" gorm:"comment:'步骤id （第几步）'"` // 步骤id （第几步）
22+
StepNo float64 `json:"stepNo" gorm:"comment:'步骤id （第几步）'"` // 步骤id （第几步）
2323
StepAuthorityID string `json:"stepAuthorityID" gorm:"comment:'操作者级别id'"` // 操作者级别id
24-
IsEnd bool `json:"isEnd" gorm:"comment:'是否是完结流节点'"` // 是否是完结流节点
24+
IsEnd bool `json:"isEnd" gorm:"comment:'是否是完结流节点'"` // 是否是完结流节点
2525
}

‎server/model/sys_workflow_process.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import "github.com/jinzhu/gorm"
55
// 工作流流转表
66
type SysWorkFlowProcess struct {
77
gorm.Model
8-
ApplicationID uint `json:"applicationID" gorm:"comment:'当前工作流所属申请的ID'"`// 当前工作流所属申请的ID
9-
CurrentNode string `json:"currentNode" gorm:"comment:'当前进度节点'"`// 当前进度节点
10-
HistoricalNode string `json:"historicalNode" gorm:"comment:'上一个进度节点'"`// 上一个进度节点
11-
CurrentUser string `json:"currentUser" gorm:"comment:'当前进度操作人'"`// 当前进度操作人
12-
HistoricalUser string `json:"historicalUser" gorm:"comment:'上一个进度的操作人'"`// 上一个进度的操作人
13-
State bool `json:"state" gorm:"comment:'状态 是否是正在进行的状态'"`// 状态 是否是正在进行的状态
8+
ApplicationID uint `json:"applicationID" gorm:"comment:'当前工作流所属申请的ID'"` // 当前工作流所属申请的ID
9+
CurrentNode string `json:"currentNode" gorm:"comment:'当前进度节点'"` // 当前进度节点
10+
HistoricalNode string `json:"historicalNode" gorm:"comment:'上一个进度节点'"` // 上一个进度节点
11+
CurrentUser string `json:"currentUser" gorm:"comment:'当前进度操作人'"` // 当前进度操作人
12+
HistoricalUser string `json:"historicalUser" gorm:"comment:'上一个进度的操作人'"` // 上一个进度的操作人
13+
State bool `json:"state" gorm:"comment:'状态 是否是正在进行的状态'"` // 状态 是否是正在进行的状态
1414
}

0 commit comments

Comments
 (0)