Merge branch 'v4.7.0dev' into v5.0.0dev

# Conflicts:
#	crmeb/public/install/crmeb.sql

crmeb/public/install/crmeb.sql

@@ -1526,7 +1526,7 @@ CREATE TABLE IF NOT EXISTS `eb_lang_code` (
   `lang_explain` varchar(255) NOT NULL DEFAULT '' COMMENT '说明',
   `is_admin` tinyint(1) NOT NULL DEFAULT '0' COMMENT '服务端1，用户端2',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=24971 DEFAULT CHARSET=utf8 COMMENT='语言code表';
+) ENGINE=InnoDB AUTO_INCREMENT=25001 DEFAULT CHARSET=utf8 COMMENT='语言code表';
 
 --
 -- 转存表中的数据 `eb_lang_code`
@@ -33327,7 +33327,7 @@ CREATE TABLE IF NOT EXISTS `eb_system_config` (
   `sort` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '排序',
   `status` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '是否隐藏',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=428 DEFAULT CHARSET=utf8 COMMENT='配置表';
+) ENGINE=InnoDB AUTO_INCREMENT=435 DEFAULT CHARSET=utf8 COMMENT='配置表';
 
 --
 -- 转存表中的数据 `eb_system_config`
@@ -33533,6 +33533,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1),
 (432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1),
 (433, 'network_security', 'text', 'input', 26, '', 1, '', 100, 0, '\"\"', '网安备案', '公安部门登记的备案信息，显示在pc底部', 0, 1);
+
 -- --------------------------------------------------------
 
 --
@@ -33550,7 +33551,7 @@ CREATE TABLE IF NOT EXISTS `eb_system_config_tab` (
   `type` int(2) NOT NULL DEFAULT '0' COMMENT '配置类型',
   `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=109 DEFAULT CHARSET=utf8 COMMENT='配置分类表';
+) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8 COMMENT='配置分类表';
 
 --
 -- 转存表中的数据 `eb_system_config_tab`
@@ -34658,7 +34659,8 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont
 (1072, 1064, '', '接口文档', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/setting/system_out_interface/index', '56/1064', 1, '', 0, 'setting-system-out-interface-index', 0),
 (1073, 25, '', '数据维护', 'admin', '', '', '', '', '[]', 7, 1, 0, 1, 'system/database/index', '25', 1, '', 0, 'system-database-index', 0),
 (1075, 731, '', '会员配置', 'admin', '', '', '', '', '[]', 6, 1, 0, 1, '/marketing/member/system_config/3/67', '27/731', 1, '', 0, 'marketing-member-system_config', 0),
-(1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0);
+(1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0),
+(1077, 7, '', '主页', 'admin', '', '', '', '', '[]', 100, 1, 0, 1, '/home', '7', 1, '', 0, 'admin-index-index', 0);
 
 -- --------------------------------------------------------