数据库变更

Merge branch 'dev' into master_new
1
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ composer.lock
 .svn
 .vscode
 node_modules
 /.idea/
--- a/application/database.php
+++ b/application/database.php
@@ -18,7 +18,7 @@ return [
    // 服务器地址
    'hostname'        => Env::get('database.hostname', '127.0.0.1'),
    // 数据库名
    'database'        => Env::get('database.database', 'hbp'),
    'database'        => Env::get('database.database', 'hbpnew'),
    // 用户名
    'username'        => Env::get('database.username', 'shuiwq'),
    // 密码
Author	SHA1	Message	Date
nizongfeng	9c6a486293	数据库变更	2 days ago
nizongfeng	bd76880dd1	Merge branch 'dev' into master_new	2 days ago
nizongfeng	f7c942c1da	1	2 days ago
nizongfeng	252e8bc235	1	2 days ago