diff --git a/pom.xml b/pom.xml index 635fa570..32293eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ co.yixiang yshop pom - 2.0 + 2.1 yshop-common diff --git a/sql/yshop2.1升级sql b/sql/yshop2.1升级sql new file mode 100644 index 00000000..43584519 --- /dev/null +++ b/sql/yshop2.1升级sql @@ -0,0 +1,18 @@ +CREATE TABLE `yx_system_store_staff` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(10) unsigned NOT NULL COMMENT '微信用户id', + `nickname` varchar(50) NOT NULL, + `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '店员头像', + `store_id` int(11) NOT NULL COMMENT '门店id', + `store_name` varchar(50) DEFAULT NULL, + `staff_name` varchar(64) DEFAULT '' COMMENT '店员名称', + `phone` char(15) DEFAULT NULL COMMENT '手机号码', + `verify_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '核销开关', + `status` tinyint(2) DEFAULT '1' COMMENT '状态', + `add_time` int(10) DEFAULT NULL COMMENT '添加时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='门店店员表'; + + +ALTER TABLE `yxshop`.`yx_user_recharge` +MODIFY COLUMN `give_price` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '购买赠送金额' AFTER `price` \ No newline at end of file diff --git a/yshop-api/pom.xml b/yshop-api/pom.xml index 11bf6ded..e113b267 100644 --- a/yshop-api/pom.xml +++ b/yshop-api/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -21,12 +21,12 @@ co.yixiang yshop-tools - 2.0 + 2.1 co.yixiang yshop-mp - 2.0 + 2.1 diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml index 5e28d562..451d4058 100644 --- a/yshop-common/pom.xml +++ b/yshop-common/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 diff --git a/yshop-generator/pom.xml b/yshop-generator/pom.xml index 4d86a819..4d1c8cd3 100644 --- a/yshop-generator/pom.xml +++ b/yshop-generator/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -20,7 +20,7 @@ co.yixiang yshop-common - 2.0 + 2.1 diff --git a/yshop-logging/pom.xml b/yshop-logging/pom.xml index e4cceb12..5c955447 100644 --- a/yshop-logging/pom.xml +++ b/yshop-logging/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -16,7 +16,7 @@ co.yixiang yshop-common - 2.0 + 2.1 \ No newline at end of file diff --git a/yshop-mp/pom.xml b/yshop-mp/pom.xml index 9b5a1bb9..643f31ab 100644 --- a/yshop-mp/pom.xml +++ b/yshop-mp/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -35,7 +35,7 @@ co.yixiang yshop-common - 2.0 + 2.1 diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml index dc203177..e84b1a17 100644 --- a/yshop-shop/pom.xml +++ b/yshop-shop/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -21,13 +21,13 @@ co.yixiang yshop-tools - 2.0 + 2.1 co.yixiang yshop-mp - 2.0 + 2.1 co.yixiang diff --git a/yshop-system/pom.xml b/yshop-system/pom.xml index 7bfedf0b..f28dc126 100644 --- a/yshop-system/pom.xml +++ b/yshop-system/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -21,7 +21,7 @@ co.yixiang yshop-generator - 2.0 + 2.1 co.yixiang @@ -34,13 +34,13 @@ co.yixiang yshop-shop - 2.0 + 2.1 co.yixiang yshop-mp - 2.0 + 2.1 co.yixiang diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml index 7d724bd4..4330147e 100644 --- a/yshop-tools/pom.xml +++ b/yshop-tools/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 2.0 + 2.1 4.0.0 @@ -23,7 +23,7 @@ co.yixiang yshop-logging - 2.0 + 2.1