Merge pull request #471 from go-admin-team/dev

Dev

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"`     //状态

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 (

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