Merge branch 'gin-vue-admin_v2_dev' of

https://github.com/flipped-aurora/gin-vue-admin into
gin-vue-admin_v2_dev

server/model/exa_breakpoint_continue.go

@@ -21,4 +21,4 @@ type ExaFileChunk struct {
 	ExaFileId       uint
 	FileChunkNumber int
 	FileChunkPath   string
-}
+}

server/model/exa_customer.go

@@ -11,4 +11,4 @@ type ExaCustomer struct {
 	SysUserID          uint    `json:"sysUserId" form:"sysUserId"`
 	SysUserAuthorityID string  `json:"sysUserAuthorityID" form:"sysUserAuthorityID"`
 	SysUser            SysUser `json:"sysUser" form:"sysUser"`
-}
+}

server/model/exa_file_upload_download.go

@@ -10,4 +10,4 @@ type ExaFileUploadAndDownload struct {
 	Url  string `json:"url"`
 	Tag  string `json:"tag"`
 	Key  string `json:"key"`
-}
+}

server/model/request/jwt.go

@@ -12,4 +12,4 @@ type CustomClaims struct {
 	NickName    string
 	AuthorityId string
 	jwt.StandardClaims
-}
+}

server/model/request/sys_api.go

@@ -2,7 +2,7 @@ package request
 
 import "gin-vue-admin/model"
 
-//api分页条件查询及排序结构体
+// api分页条件查询及排序结构体
 type SearchApiParams struct {
 	model.SysApi
 	PageInfo

server/model/request/sys_menu.go

@@ -11,4 +11,4 @@ type AddMenuAuthorityInfo struct {
 // Get role by id structure
 type AuthorityIdInfo struct {
 	AuthorityId string
-}
+}

server/model/request/sys_user.go

@@ -30,4 +30,4 @@ type ChangePasswordStruct struct {
 type SetUserAuth struct {
 	UUID        uuid.UUID `json:"uuid"`
 	AuthorityId string    `json:"authorityId"`
-}
+}

server/model/response/exa_breakpoint_continue.go

@@ -8,4 +8,4 @@ type FilePathResponse struct {
 
 type FileResponse struct {
 	File model.ExaFile `json:"file"`
-}
+}

server/model/sys_api.go

@@ -10,4 +10,4 @@ type SysApi struct {
 	Description string `json:"description"`
 	ApiGroup    string `json:"apiGroup"`
 	Method      string `json:"method" gorm:"default:'POST'"`
-}
+}

server/model/sys_authority.go

@@ -14,4 +14,4 @@ type SysAuthority struct {
 	DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id;association_jointable_foreignkey:data_authority_id"`
 	Children        []SysAuthority `json:"children"`
 	SysBaseMenus    []SysBaseMenu  `json:"menus" gorm:"many2many:sys_authority_menus;"`
-}
+}

server/model/sys_authority_menu.go

@@ -5,4 +5,4 @@ type SysMenu struct {
 	MenuId      string    `json:"menuId"`
 	AuthorityId string    `json:"-"`
 	Children    []SysMenu `json:"children"`
-}
+}

server/model/sys_casbin.go

@@ -6,4 +6,4 @@ type CasbinModel struct {
 	AuthorityId string `json:"rolename" gorm:"column:v0"`
 	Path        string `json:"path" gorm:"column:v1"`
 	Method      string `json:"method" gorm:"column:v2"`
-}
+}

server/model/sys_jwt_blacklist.go

@@ -7,4 +7,4 @@ import (
 type JwtBlacklist struct {
 	gorm.Model
 	Jwt string `gorm:"type:text"`
-}
+}

server/model/sys_system.go

@@ -4,7 +4,7 @@ import (
 	"gin-vue-admin/config"
 )
 
-//配置文件结构体
+// 配置文件结构体
 type System struct {
 	Config config.Server
-}
+}

server/model/sys_user.go

@@ -14,4 +14,4 @@ type SysUser struct {
 	HeaderImg   string       `json:"headerImg" gorm:"default:'http://qmplusimg.henrongyi.top/head.png'"`
 	Authority   SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId"`
 	AuthorityId string       `json:"authorityId" gorm:"default:888"`
-}
+}

server/model/sys_workflow.go

@@ -4,7 +4,7 @@ import (
 	"github.com/jinzhu/gorm"
 )
 
-//工作流属性表
+// 工作流属性表
 type SysWorkflow struct {
 	gorm.Model
 	WorkflowNickName    string                `json:"workflowNickName"`    // 工作流名称
@@ -22,4 +22,4 @@ type SysWorkflowStepInfo struct {
 	StepNo          float64 `json:"stepNo"`          // 步骤id （第几步）
 	StepAuthorityID string  `json:"stepAuthorityID"` // 操作者级别id
 	IsEnd           bool    `json:"isEnd"`           // 是否是完结流节点
-}
+}

server/model/sys_workflow_process.go

@@ -7,7 +7,7 @@ type SysWorkFlowProcess struct {
 	gorm.Model
 	ApplicationID  uint   // 当前工作流所属申请的ID
 	CurrentNode    string // 当前进度节点
-	HistoricalNode string //上一个进度节点
+	HistoricalNode string // 上一个进度节点
 	CurrentUser    string // 当前进度操作人
 	HistoricalUser string // 上一个进度的操作人
 	State          bool   // 状态 是否是正在进行的状态