change sql

sql.sql

@@ -1391,4 +1391,7 @@ ALTER TABLE `xhTrainTeacher` CHANGE `createTime` `addTime` TIMESTAMP NOT NULL DE
 ALTER TABLE xhTrainUserCourse RENAME TO xhPxUserCourse;
 ALTER TABLE xhTrainTeacher RENAME TO xhPxTeacher;
 ALTER TABLE xhTrainCourse RENAME TO xhPxCourse;
-ALTER TABLE xhTrainClass RENAME TO xhPxClass;
+ALTER TABLE xhTrainClass RENAME TO xhPxClass;
+ALTER TABLE `xhOrder` MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '订单状态 1待付款 2待配送 3配送中 4已完成 5已取消 6已退款';
+ALTER TABLE xhPxTeacher CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id';
+ALTER TABLE xhPxUserCourse CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id';