门店和员工表调整

biz-ghs/merchant/models/Shop.php

@@ -7,7 +7,7 @@ class Shop extends Base
 
 	public static function tableName()
 	{
-		return 'xhGhsShop';
+		return 'xhShop';
 	}
 
 }

biz-ghs/shop/models/ShopAdmin.php

@@ -9,7 +9,7 @@ class ShopAdmin extends Base
 	
 	public static function tableName()
 	{
-		return 'xhGhsShopAdmin';
+		return 'xhShopAdmin';
 	}
 	
 }

sql.sql

@@ -1177,4 +1177,6 @@ CREATE TABLE IF NOT EXISTS `xhRechargeSn` (
 ALTER TABLE xhRecharge ADD orderSn CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
 ALTER TABLE `xhRecharge` ADD `modPrice` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '0不能修改价格 1可以修改' AFTER `orderSn`;
 ALTER TABLE `xhRecharge` ADD `deadline` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '订单有效时间' AFTER `modPrice`;
-ALTER TABLE xhRecharge ADD payStatus TINYINT NOT NULL DEFAULT 1 COMMENT '1待付款 2已付款' AFTER `totalRecharge`;
+ALTER TABLE xhRecharge ADD payStatus TINYINT NOT NULL DEFAULT 1 COMMENT '1待付款 2已付款' AFTER `totalRecharge`;
+DROP TABLE `xhGhsShopAdmin`;
+DROP TABLE `xhGhsShop`;