diff --git a/Data/Config.simple.php b/Data/Config.simple.php
index 6c175e0f..817665ed 100755
--- a/Data/Config.simple.php
+++ b/Data/Config.simple.php
@@ -17,7 +17,7 @@
  * Theme setting:
  *
  */
-define('THEME', 'Default');
+define('THEME', 'Xenon');
 
 /**
  * Resource url setting:
diff --git a/Data/version.lock b/Data/version.lock
index ae224da4..134bf77c 100644
--- a/Data/version.lock
+++ b/Data/version.lock
@@ -1 +1 @@
-V1.1.90
\ No newline at end of file
+V1.2.0
\ No newline at end of file
diff --git a/Library/Model/Order.php b/Library/Model/Order.php
index b94c16ff..0e8e45f4 100644
--- a/Library/Model/Order.php
+++ b/Library/Model/Order.php
@@ -19,7 +19,7 @@ class Order extends Model
 {
 
     public $id;
-    public $userid;
+    public $userId;
     public $createTime;
     public $type; // 类型： 0 - 购买套餐 1 - 账户金额充值 2 - 购买卡号
     public $status;
diff --git a/Migrations/20160706073441_create_table_order.php b/Migrations/20160706073441_create_table_order.php
deleted file mode 100644
index e4819980..00000000
--- a/Migrations/20160706073441_create_table_order.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-class CreateTableOrder extends AbstractMigration
-{
-    public function change()
-    {
-        $this->table("orders", array( 'comment' => '订单id'))
-            ->addColumn('createTime', 'integer', ['limit' => 1])
-            ->addColumn('nextrun', 'integer', ['limit' => 11])
-            ->addColumn('status', 'integer', ['limit' => 1])
-            ->addIndex(['id', 'nextrun'],[])
-            ->create();
-    }
-}
diff --git a/Migrations/20160706073442_create_table_order.php b/Migrations/20160706073442_create_table_order.php
new file mode 100644
index 00000000..0a3f942b
--- /dev/null
+++ b/Migrations/20160706073442_create_table_order.php
@@ -0,0 +1,25 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+class CreateTableOrder extends AbstractMigration
+{
+    public function change()
+    {
+        if ($this->hasTable("orders")) {
+            $this->dropTable("orders");
+        }
+
+        $this->table("orders", array( 'comment' => '订单id'))
+            ->addColumn('userId', 'integer', ['limit' => 11])
+            ->addColumn('createTime', 'integer', ['limit' => 11])
+            ->addColumn('type', 'integer', ['limit' => MysqlAdapter::INT_TINY])
+            ->addColumn('status', 'integer', ['limit' => MysqlAdapter::INT_TINY])
+            ->addColumn('plan', 'string', ['limit' => 4])
+            ->addColumn('money', 'integer', ['limit' => 11])
+            ->addColumn('remark', 'string', ['limit' => 100])
+            ->addIndex(['id', 'status'],[])
+            ->create();
+    }
+}