Merge branch 'feature/group_type' into dev

# Conflicts: # Data/update.sql
5 years ago · b601d610d9
parent b735706006 e4b07360ad
commit b601d610d9
1 changed files with 0 additions and 1 deletions
--- a/Data/update.sql
+++ b/Data/update.sql
@ -1033,7 +1033,6 @@ CREATE TABLE `tab_cp_game_ratio` (
 -- 玩家列表账户锁定添加备注  2020-01-09 郑昌隆
 ALTER TABLE `tab_user` ADD COLUMN `lock_remark` varchar(512) NOT NULL DEFAULT '' COMMENT '账号锁定原因' after lock_status;

-
 -- 平台规则
 CREATE TABLE `sys_document_pop_rules` (
  `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '平台规则表',