XM-GO 332d7721c9 Merge branch 'iot' ...

# Conflicts:
#	apps/develop/api/gen.go
#	apps/develop/api/table.go
#	apps/develop/router/gen.go
#	apps/develop/router/table.go
#	apps/job/api/job.go
#	apps/job/entity/job.go
#	apps/job/entity/log_job.go
#	apps/job/jobs/jobbase.go
#	apps/job/router/job.go
#	apps/log/api/log_job.go
#	apps/log/api/log_login.go
#	apps/log/api/log_oper.go
#	apps/log/router/log.go
#	apps/log/services/log_job.go
#	apps/resource/api/email.go
#	apps/resource/api/oss.go
#	apps/resource/router/email.go
#	apps/resource/router/oss.go
#	apps/system/api/api.go
#	apps/system/api/config.go
#	apps/system/api/dept.go
#	apps/system/api/dict.go
#	apps/system/api/menu.go
#	apps/system/api/notice.go
#	apps/system/api/post.go
#	apps/system/api/role.go
#	apps/system/api/system.go
#	apps/system/api/tenant.go
#	apps/system/api/user.go
#	apps/system/router/api.go
#	apps/system/router/config.go
#	apps/system/router/dept.go
#	apps/system/router/dict.go
#	apps/system/router/menu.go
#	apps/system/router/notice.go
#	apps/system/router/post.go
#	apps/system/router/role.go
#	apps/system/router/tenant.go
#	apps/system/router/user.go
#	go.mod
#	go.sum
#	main.go
#	pkg/config/app.go
#	pkg/config/casbin.go
#	pkg/config/config.go
#	pkg/config/db.go
#	pkg/config/gen.go
#	pkg/config/jwt.go
#	pkg/config/log.go
#	pkg/config/redis.go
#	pkg/config/server.go
#	pkg/global/global.go
#	pkg/initialize/table.go
#	pkg/middleware/log.go
#	pkg/middleware/oper.go
#	pkg/middleware/permission.go
#	resource/template/go/api.template
#	resource/template/go/router.template
#	resource/template/go/service.template

2023-08-22 15:47:45 +08:00

5.3 KiB

Raw Blame History

View Raw