Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	template/v4/dto.go.template

app/admin/router/syschinaareadata.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/apis/sys_china_area_data"
+	"go-admin/app/admin/middleware"
+	jwt "go-admin/pkg/jwtauth"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter)
+}
+
+// 需认证的路由代码
+func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_china_area_data.SysChinaAreaData{}
+	r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", api.GetSysChinaAreaDataList)
+		r.GET("/:id", api.GetSysChinaAreaData)
+		r.POST("", api.InsertSysChinaAreaData)
+		r.PUT("/:id", api.UpdateSysChinaAreaData)
+		r.DELETE("", api.DeleteSysChinaAreaData)
+	}
+}

app/admin/router/wf_classify.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/apis/process"
+	"go-admin/app/admin/middleware"
+	jwt "go-admin/pkg/jwtauth"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerWfProcessClassifyRouter)
+}
+
+// 需认证的路由代码
+func registerWfProcessClassifyRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &process.WfProcessClassify{}
+	r := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", api.GetWfProcessClassifyList)
+		r.GET("/:id", api.GetWfProcessClassify)
+		r.POST("", api.InsertWfProcessClassify)
+		r.PUT("/:id", api.UpdateWfProcessClassify)
+		r.DELETE("", api.DeleteWfProcessClassify)
+	}
+}