From d0f49ef8c7f930e27b3be14cccc09213a4f86eca Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 1 Jul 2021 22:24:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA(#165)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_dept.go | 2 +- go.mod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index 4e4a573f..b0427ea8 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -32,7 +32,7 @@ type SysDeptControl struct { DeptPath string `json:"deptPath" comment:""` //路径 DeptName string `json:"deptName" comment:"部门名称" vd:"len($)>0"` //部门名称 Sort int `json:"sort" comment:"排序" vd:"?"` //排序 - Leader string `json:"leader,required" comment:"负责人" vd:"@:len($)>0;msg:validation failed:该字段不能为空"` //负责人 + Leader string `json:"leader" comment:"负责人" vd:"@:len($)>0; msg:'leader不能为空'"` //负责人 Phone string `json:"phone" comment:"手机" vd:"?"` //手机 Email string `json:"email" comment:"邮箱" vd:"?"` //邮箱 Status int `json:"status" comment:"状态" vd:"$>0"` //状态 diff --git a/go.mod b/go.mod index 91d3da0e..7c276c9b 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/alibaba/sentinel-golang v0.6.1 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 - github.com/bytedance/go-tagexpr/v2 v2.7.10 + github.com/bytedance/go-tagexpr/v2 v2.7.12 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.7.1 - github.com/go-admin-team/go-admin-core v1.3.5-rc.6.0.20210629084023-dc3d0627688c - github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6.0.20210629084023-dc3d0627688c + github.com/go-admin-team/go-admin-core v1.3.5-rc.6.0.20210701142131-afcbe40a6a3b + github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6.0.20210701142131-afcbe40a6a3b github.com/google/uuid v1.2.0 github.com/mssola/user_agent v0.5.2 github.com/opentracing/opentracing-go v1.1.0 From 760c6b28143cc9ff561fff394b83e74a4cba5ec1 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 1 Jul 2021 22:25:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/global/adm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/global/adm.go b/common/global/adm.go index 677cbc94..de8ad4c1 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin version info - Version = "2.0.0-beta.8" + Version = "2.0.0-beta.9" ) var (