Merge branch 'dev_yh' into 'release'

1分钱测试

See merge request !46

center/controllers/user.php

@@ -1922,7 +1922,7 @@ class User extends MY_Controller
             }
         }
 
-        $userIdArr = array(4112782,5355879,1729793,4449390,6264549,6261067);
+        $userIdArr = array(4112782,5355879,1729793,4449390,6264549,6261067,6291659);
         if(in_array($this->user_id,$userIdArr)){
             $price = $price * 0.01;
         }