From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/config/db/increment/美度业绩升级.sql |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git "a/zq-erp/src/main/resources/config/db/increment/\347\276\216\345\272\246\344\270\232\347\273\251\345\215\207\347\272\247.sql" "b/zq-erp/src/main/resources/config/db/increment/\347\276\216\345\272\246\344\270\232\347\273\251\345\215\207\347\272\247.sql"
new file mode 100644
index 0000000..0a352f7
--- /dev/null
+++ "b/zq-erp/src/main/resources/config/db/increment/\347\276\216\345\272\246\344\270\232\347\273\251\345\215\207\347\272\247.sql"
@@ -0,0 +1,15 @@
+ALTER TABLE `achieve_new`
+    ADD COLUMN `achieveMoney` double(10, 0) NULL AFTER `company_id`;
+
+
+ALTER TABLE `sys_order`
+    ADD COLUMN `orderType` int(2) NULL COMMENT '订单类型1，销售订单，2退款订单' AFTER `company_id`;
+
+
+ALTER TABLE `achieve_new`
+    CHANGE COLUMN `t3` `achieveType` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `t2`;
+
+ALTER TABLE `sys_order_item`
+    ADD COLUMN `refundCount` int(11) NULL COMMENT '退款数量' AFTER `pay_method_detail`;
+
+

--
Gitblit v1.9.1