# Conflicts:
#	server/go.mod
#	server/initialize/data.go
#	server/model/sys_base_menu.go
#	server/service/sys_db_initialize.go

修改docker-compose的mysql镜像源为官方的mysql,脚本和初始数据迁移到.docker-compose文件夹下,为docker-server添加ls -al方便使用docker-compose的时候调试错误

# Conflicts:
#	server/db/qmplus.sql

Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

 Conflicts:
	server/core/install_plugs.go
	server/initialize/plug.go
	server/model/sys_authority.go

Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

 Conflicts:
	server/db/qmplus.sql
	server/service/sys_menu.go

Merge branches 'develop' and 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev

 Conflicts:
	server/db/qmplus.sql
	server/service/sys_menu.go