Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

 Conflicts:
	QMPlusServer/db/jwt_blacklists.sql
	QMPlusServer/db/sys_base_menus.sql
	QMPlusServer/db/sys_menus.sql
	QMPlusServer/tpl/te/router.go.tpl
	README.md
	server/db/qmplus.sql

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Add version list to README.md
# Conflicts:
#	README-zh_CN.md

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	README.md

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

Merge branches 'gin-vue-admin_v1_stable' and 'master' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v1_stable

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	README.md

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev