dos

Application/Common/Conf/db.php

 <?php
 <?php
 return array(
 return array(
-<<<<<<< HEAD
    'DB_TYPE' => 'mysqli',
    'DB_TYPE' => 'mysqli',
    'DB_HOST' => 'mysql-sh',
    'DB_HOST' => 'mysql-sh',
    'DB_PORT' => '3306',
    'DB_PORT' => '3306',
@@ -9,16 +8,6 @@ return array(
    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
    'DB_PREFIX' => '',
    'DB_PREFIX' => '',
    'DB_CHARSET' => 'utf8mb4',
    'DB_CHARSET' => 'utf8mb4',
-=======
-    'DB_TYPE' => 'mysqli',
-    'DB_HOST' => 'mysql-sh',
-    'DB_PORT' => '3306',
-    'DB_NAME' => 'project_citic_20210430_mdrt4', // <--- 修改这里
-    'DB_USER' => 'zhida', // <--- 修改这里
-    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
-    'DB_PREFIX' => '',
-    'DB_CHARSET' => 'utf8mb4',
->>>>>>> 685ca97d8e33f630b7e49b9a3ea4bcbbac3970cd
    
    
 );
 );