diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql
deleted file mode 100644
index 427b6e817..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table `wx_msg_validationcode_model` modify column content text;
-
-ALTER TABLE `wx_msg_validationcode_model`
-ADD COLUMN `email_bg_img` varchar(300) DEFAULT NULL COMMENT '邮箱背景图片';
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql
deleted file mode 100644
index 8a8f99028..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE wx_c_user
- ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间';
-ALTER TABLE wx_c_user_basic_info
- ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql
deleted file mode 100644
index 6d990f8ef..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql
+++ /dev/null
@@ -1,78 +0,0 @@
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10,'789', '审批通过通知', '富茂', '
富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'http://202.165.179.86:8081/images/WechatIMG5130.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1001', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1001', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1001', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1001', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1001', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1001', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1002', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1002', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1002', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1002', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1002', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1002', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1003', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1003', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1003', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1003', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1003', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1003', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1004', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1004', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1004', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1004', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1004', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1004', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1005', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1005', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1005', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1005', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1005', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1005', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png');
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1006', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1006', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1006', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1006', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1006', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1006', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png');
-
-
-INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
-VALUES
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1007', '审批通过通知', '富茂', '富茂审批邮件审批通过通知
编号
{contract}的{bustype}已经审批通过,请登录
{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1007', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1007', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n
审批通知
\n
{userName}同意编号
{contract}的{bustype}审批,已呈送
{toUserName},请登录
{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1007', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n \n
\n
租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n \n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1007', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n \n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n \n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
- ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1007', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n \n
\n
\n \n
\n \n
审批通过通知
\n
编号
{contract}的{bustype}审批被驳回,请登录
{page}查看审批明细
\n
\n \n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n \n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n \n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg');
-
-
-
-
-
-
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql
deleted file mode 100644
index b95b706f1..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知');
-alter table wx_msg_model drop column email_bg_img;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql
deleted file mode 100644
index 51acaa124..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table wx_merchant add column top_time datetime default now() comment '置顶时间';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql
deleted file mode 100644
index aca7cc15c..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql
+++ /dev/null
@@ -1 +0,0 @@
-update wx_score_rules set rules = JSON_REMOVE(rules,'$[3]');
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql
deleted file mode 100644
index 6ea1044b5..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE wx_mall
- ADD COLUMN sale_type tinyint(2) DEFAULT '1' COMMENT '销售类型',
- ADD COLUMN valid_start DATE default null COMMENT '启用起始时间',
- ADD COLUMN valid_end DATE default null COMMENT '启用结束时间';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql
deleted file mode 100644
index e04f44ffb..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table wx_profit_sharing_receiver add column is_use smallint(2) default 0 comment '是否使用1使用0不使用';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql
deleted file mode 100644
index 0aba7bb9a..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql
+++ /dev/null
@@ -1,102 +0,0 @@
-#商户分账账户新增通知商管
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(80,'456','10','商户分账账户新增通知商管','富茂','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(110,'1001','10','商户分账账户新增通知商管','长融世贸广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(210,'1002','10','商户分账账户新增通知商管','同保楼 同福街','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(310,'1003','10','商户分账账户新增通知商管','杭州东站西子国际','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(410,'1004','10','商户分账账户新增通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(510,'1005','10','商户分账账户新增通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(610,'1006','10','商户分账账户新增通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(710,'1007','10','商户分账账户新增通知商管','澳林广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
-#商户分账账户新增通知商户
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(81,'456','11','商户分账账户新增通知商户','富茂','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(111,'1001','11','商户分账账户新增通知商户','长融世贸广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(211,'1002','11','商户分账账户新增通知商户','同保楼 同福街','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(311,'1003','11','商户分账账户新增通知商户','杭州东站西子国际','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(411,'1004','11','商户分账账户新增通知商户','莱迪1086商业中心','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(511,'1005','11','商户分账账户新增通知商户','永修铜锣湾广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(611,'1006','11','商户分账账户新增通知商户','欧堡利亚海悦城','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(711,'1007','11','商户分账账户新增通知商户','澳林广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-#商户分账账户变更通知商管
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(82,'456','12','商户分账账户变更通知商管','富茂','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(112,'1001','12','商户分账账户变更通知商管','长融世贸广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(212,'1002','12','商户分账账户变更通知商管','同保楼 同福街','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(312,'1003','12','商户分账账户变更通知商管','杭州东站西子国际','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(412,'1004','12','商户分账账户变更通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(512,'1005','12','商户分账账户变更通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(612,'1006','12','商户分账账户变更通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(712,'1007','12','商户分账账户变更通知商管','澳林广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
-#商户分账账户变更通知商户
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(83,'456','13','商户分账账户变更通知商户','富茂','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(113,'1001','13','商户分账账户变更通知商户','长融世贸广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(213,'1002','13','商户分账账户变更通知商户','同保楼 同福街','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(313,'1003','13','商户分账账户变更通知商户','杭州东站西子国际','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(413,'1004','13','商户分账账户变更通知商户','莱迪1086商业中心','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(513,'1005','13','商户分账账户变更通知商户','永修铜锣湾广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(613,'1006','13','商户分账账户变更通知商户','欧堡利亚海悦城','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(713,'1007','13','商户分账账户变更通知商户','澳林广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
-#商户分账账户使用回执
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(84,'456','14','商户分账账户不使用回执','富茂','商管已同意{account}作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(114,'1001','14','商户分账账户不使用回执','长融世贸广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(214,'1002','14','商户分账账户不使用回执','同保楼 同福街','商管已同意]{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(314,'1003','14','商户分账账户不使用回执','杭州东站西子国际','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(414,'1004','14','商户分账账户不使用回执','莱迪1086商业中心','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(514,'1005','14','商户分账账户不使用回执','永修铜锣湾广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(614,'1006','14','商户分账账户不使用回执','欧堡利亚海悦城','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(714,'1007','14','商户分账账户不使用回执','澳林广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
-#商户分账账户不使用回执
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(85,'456','15','商户分账账户使用回执','富茂','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(115,'1001','15','商户分账账户使用回执','长融世贸广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(215,'1002','15','商户分账账户使用回执','同保楼 同福街','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(315,'1003','15','商户分账账户使用回执','杭州东站西子国际','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(415,'1004','15','商户分账账户使用回执','莱迪1086商业中心','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(515,'1005','15','商户分账账户使用回执','永修铜锣湾广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(615,'1006','15','商户分账账户使用回执','欧堡利亚海悦城','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(715,'1007','15','商户分账账户使用回执','澳林广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql
deleted file mode 100644
index b301981d5..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table wx_profit_sharing_receiver
-modify column is_use smallint(2) default 2 comment '是否使用0使用1不使用2申请';
-update wx_profit_sharing_receiver set is_use =0 where status=0;
-update wx_profit_sharing_receiver set is_use =1 where status=1;
-
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql
deleted file mode 100644
index 3895904d4..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `wx_car_cmd_log`
-ADD COLUMN `plateNumber` VARCHAR(32) GENERATED ALWAYS AS (json_unquote(json_extract(`cmd_json`,'$.plateNumber'))) VIRTUAL AFTER `cmd_json`;
-ALTER TABLE `wx_car_cmd_log`
-ADD INDEX `idx_plateNumber` (`plateNumber` ASC, `tenant_id` ASC);
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql
deleted file mode 100644
index 12e60bbcf..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-update wx_coupon_channel set begin_time = create_date where begin_time is null;
-update wx_coupon_channel co, wx_coupon c set co.end_time = c.valid_end_date where co.target_ad != 2 and co.target_ad != 8 and co.coupon_id = c.id and c.valid_type = 1 and co.end_time is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
deleted file mode 100644
index 2b62e3cf3..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-update wx_coupon_channel c set type = (select type from wx_coupon where id = c.coupon_id ),
-business = (select business from wx_coupon where id = c.coupon_id ),
-sub_business = (select sub_business from wx_coupon where id = c.coupon_id )
-where c.type is null or c.business is null or c.sub_business is null
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql
deleted file mode 100644
index c91d231d7..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-#商户分账账户删除提醒
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(86,'456','16','商户分账账户删除提醒','富茂','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(116,'1001','16','商户分账账户删除提醒','长融世贸广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(216,'1002','16','商户分账账户删除提醒','同保楼 同福街','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(316,'1003','16','商户分账账户删除提醒','杭州东站西子国际','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(416,'1004','16','商户分账账户删除提醒','莱迪1086商业中心','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(516,'1005','16','商户分账账户删除提醒','永修铜锣湾广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(616,'1006','16','商户分账账户删除提醒','欧堡利亚海悦城','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
-values(716,'1007','16','商户分账账户删除提醒','澳林广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
-
-#删除不需要的短信模板
-delete from wx_msg_validationcode_model where id in (80,82,110,112,210,212,310,312,410,412,510,512,610,612,710,712);
-#商户分账账户新增通知商户内容更新
-update wx_msg_validationcode_model set content='您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户' where id in(81,111,211,311,411,511,611,711);
-#商户分账账户变更通知商户内容更新
-update wx_msg_validationcode_model set content='您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户' where id in(83,113,213,313,413,513,613,713);
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql
deleted file mode 100644
index 50f8a052b..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-DROP TABLE IF EXISTS `mall_resource` ;
-CREATE TABLE `mall_resource` (
- `id` bigint(64) NOT NULL,
- `tenant_id` varchar(50) DEFAULT NULL COMMENT '租户ID',
- `bucket` varchar(20) DEFAULT '' COMMENT 'bucket名称',
- `s3_key` varchar(100) DEFAULT NULL COMMENT 's3 key',
- `url` varchar(1024) DEFAULT NULL COMMENT 's3 url',
- PRIMARY KEY (`id`)
-) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='资源表' CHECKSUM=0 DELAY_KEY_WRITE=0;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql
deleted file mode 100644
index 3e95db4bd..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE wx_merchant_trade_daily
- ADD COLUMN trade_count int(10) DEFAULT 0 COMMENT '交易笔数';
-
-ALTER TABLE wx_merchant_trade_daily
- ADD COLUMN proof varchar(500) DEFAULT NULL COMMENT '凭证';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql
deleted file mode 100644
index dc2ab0060..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-UPDATE `wx_tags` SET `name` = '活跃度低' WHERE (`id` = '110');
-UPDATE `wx_tags` SET `name` = '活跃度中' WHERE (`id` = '111');
-UPDATE `wx_tags` SET `name` = '活跃度高' WHERE (`id` = '112');
-UPDATE `wx_tags` SET `name` = '消费频率低' WHERE (`id` = '107');
-UPDATE `wx_tags` SET `name` = '消费频率中' WHERE (`id` = '108');
-UPDATE `wx_tags` SET `name` = '消费频率高' WHERE (`id` = '109');
-UPDATE `wx_tags` SET `name` = '实惠型消费' WHERE (`id` = '104');
-UPDATE `wx_tags` SET `name` = '享乐型消费' WHERE (`id` = '105');
-UPDATE `wx_tags` SET `name` = '品质型消费' WHERE (`id` = '106');
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql
deleted file mode 100644
index 5a0a1bbad..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE wx_merchant
- ADD COLUMN qr_code varchar(500) DEFAULT NULL COMMENT '二维码地址';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql
deleted file mode 100644
index df6b39ddc..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-update wx_bill_rent set owe=receive_pay-pay where status in (2,4);
-update wx_bill_property set owe=receive_pay-pay where status in(2,4);
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql
deleted file mode 100644
index c1e584402..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `wx_merchant`
-ADD COLUMN `introduction` VARCHAR(2048) NULL DEFAULT NULL AFTER `qr_code`;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql
deleted file mode 100644
index f576a8ba8..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-DROP TABLE IF EXISTS `mall_sale_type` ;
-CREATE TABLE `mall_sale_type` (
- `id` bigint(64) NOT NULL,
- `name` varchar(32) DEFAULT NULL COMMENT '销售类型',
- `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:标准版 2:速享版 3.营销版',
- `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)',
- `menus` json DEFAULT NULL COMMENT '菜单列表',
- PRIMARY KEY (`id`),
- UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
-) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0;
-
-INSERT INTO `mall_sale_type`
- (`id`,`name`, `type`, `period`, `menus`)
-VALUES
- (1, '尊享全能版', 1, 12,
- '[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
- ),
- (2, '尊享营销版', 2, 12,
- '[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
- ),
- (3, '速享版', 3, 1,
- '[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]'
- )
-
- ;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql
deleted file mode 100644
index 04c41e937..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_coupon
- ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`;
-
-UPDATE wx_coupon SET cover_picture=json_array(cover_img) WHERE cover_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql
deleted file mode 100644
index 2c4b23148..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_campaign
- ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`;
-
-UPDATE wx_campaign SET cover_picture=json_array(cover_img) WHERE cover_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql
deleted file mode 100644
index 2b249e938..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_topic
- ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover`;
-
-UPDATE wx_topic SET cover_picture=json_array(cover) WHERE cover_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql
deleted file mode 100644
index 8bf1df2d2..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql
+++ /dev/null
@@ -1 +0,0 @@
-update wx_msg_validationcode_model set content = '截止今日{merName}的账单共计欠缴{price}元,请登录{app}小程序查看账单并交费。' where type = 8
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql
deleted file mode 100644
index 0918f95b8..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql
+++ /dev/null
@@ -1,155 +0,0 @@
-DROP TABLE IF EXISTS `mall_permission` ;
-CREATE TABLE `mall_permission` (
- `id` bigint(64) NOT NULL,
- `name` varchar(32) DEFAULT NULL COMMENT '权限名称',
- `parent_id` bigint(64) DEFAULT NULL COMMENT '父编号ID,一级菜单为0',
- `available` varchar(1) DEFAULT 'Y' COMMENT '是否可用 Y/N',
- `permission` varchar(50) DEFAULT NULL COMMENT '授权(多个用逗号分隔,如:user:list,user:create)',
- `resource_type` tinyint(2) DEFAULT NULL COMMENT '资源类型0:目录 1:菜单 2:按钮 3:其它',
- `module_color` varchar(10) DEFAULT NULL COMMENT '菜单背景色-1级菜单使用',
- `module_color_num` varchar(15) DEFAULT NULL COMMENT '菜单字体颜色-1级菜单使用',
- `url` varchar(50) DEFAULT NULL COMMENT '资源路径(user/list or http://localhost/1.html)',
- `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标',
- `version_type` tinyint(2) DEFAULT NULL COMMENT '版本类型(0:标准版)',
- `sort` int(10) DEFAULT NULL COMMENT '排序',
- PRIMARY KEY (`id`),
- UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
-) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统权限表(当前到button)' CHECKSUM=0 DELAY_KEY_WRITE=0;
-
-INSERT INTO `mall_permission`
- (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`)
-VALUES
- (1, '数据塔台', 0, 'Y', null, 0, '#EE7653', '238,118,83', null, null, 0, 1),
- (2, '商户商铺', 0, 'Y', null, 0, '#51A9C9', '81,169,201', null, null, 0, 2),
- (3, '合同管理', 0, 'Y', null, 0, '#5A76BF', '90,118,191', null, null, 0, 3),
- (4, '账单管理', 0, 'Y', null, 0, '#3FC496', '63,196,150', null, null, 0, 4),
- (5, '会员系统', 0, 'Y', null, 0, '#6B5EC9', '107,94,201', null, null, 0, 5),
- (6, '营销系统', 0, 'Y', null, 0, '#C85963', '200,89,99', null, null, 0, 6),
- (7, '账号管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 9),
- (8, '移动端数据塔台', 0, 'Y', null, 3, '#B23D8B', '178,61,139', null, null, 0, 8),
- (9, '智能硬件', 0, 'Y', null, 0, '#E19549', '225,149,73', null, null, 0, 7),
- (10, '首页', 0, 'Y', null, 1, '#E19549', '225,149,73', null, null, 0, 10),
- (50, '系统管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 50),
-
- (101, '数据总览', 1, 'Y', null, 1, null, null, 'zonglan', 'icon-fumao-shujuzonglan', 0, 101),
- (102, '运营数据', 1, 'Y', null, 1, null, null, 'yunying', 'icon-shuju1', 0, 102),
- (103, '客流数据', 1, 'Y', null, 1, null, null, 'keliu', 'icon-shuju', 0, 103),
- (104, '车流数据', 1, 'Y', null, 1, null, null, 'cheliu', 'icon-shujuquxianzoushiqushijiantouzhuzhuangtubiao', 0, 104),
- (105, '线上营销交易', 1, 'Y', null, 1, null, null, 'yingxiao', 'icon-shuju2', 0, 105),
- (106, '用户数据', 1, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-yonghushuju', 0, 106),
- (107, 'WIFI使用数据', 1, 'Y', null, 1, null, null, 'wifiuse', 'icon-wifi', 0, 107),
-
- (201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 202),
- (202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 203),
- (203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 204),
- (204, '商户收银', 2, 'Y', null, 1, null, null, 'merchantCashierList', 'icon-shouyintai', 0, 205),
- (205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 206),
- (206, '租赁概览', 2, 'Y', null, 1, null, null, 'dataShoprental', 'icon-chuzu', 0, 201),
-
- (211, '店铺', 201, 'Y', null, 1, null, null, 'shoplist', null, 0, 211),
- (212, '多经点位', 201, 'Y', null, 1, null, null, 'pointlist', null, 0, 212),
- (221, '店铺商户', 202, 'Y', null, 1, null, null, 'merchantList', null, 0, 221),
- (222, '多经点位商户', 202, 'Y', null, 1, null, null, 'pointmerchantList', null, 0, 222),
- (251, '品牌列表', 205, 'Y', null, 1, null, null, 'brandlist', null, 0, 251),
-
- (301, '商铺租赁合同', 3, 'Y', null, 1, null, null, 'rentlist', 'icon-zhangdan', 0, 301),
- (302, '商铺物业合同', 3, 'Y', null, 1, null, null, 'tenementlist', 'icon-zulinhetong1', 0, 302),
- (303, '多经点位租赁合同', 3, 'Y', null, 1, null, null, 'pointrentlist', 'icon-wuyehetong', 0, 303),
- (304, '多经点位物业合同', 3, 'Y', null, 1, null, null, 'pointtenementlist', 'icon-changfangwuyehetong', 0, 304),
-
- (401, '账单总览', 4, 'Y', null, 1, null, null, 'collectionRate', 'icon-feiyongshoujiao-', 0, 401),
- (402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-wodezulinzhangdan', 0, 404),
- (403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 405),
- (404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-zulinhetong', 0, 406),
- (405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 407),
- (406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 408),
- (407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 409),
- (408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 410),
- (409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 411),
- (410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 412),
- (411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 413),
- (412, '账单列表', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 402),
- (413, '商户账单', 4, 'Y', null, 1, null, null, 'collectionRateList', 'icon-bucaozulin', 0, 403),
-
- (501, '用户概览', 5, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-tubiaochicundaochuSVGshangchuandaoalibaba-', 0, 501),
- (502, '用户数量', 5, 'Y', null, 1, null, null, 'huiyuanShuliang', 'icon-yonghuguanli2', 0, 502),
- (503, '拓客分析', 5, 'Y', null, 1, null, null, 'huiyuanTuoke', 'icon-tuoke', 0, 503),
- (504, '会员结构', 5, 'Y', null, 1, null, null, 'huiyuanJiegou', 'icon-bianjiICONCopy', 0, 504),
- (505, '会员列表', 5, 'Y', null, 1, null, null, 'huiyuanList', 'icon-huiyuanliebiao', 0, 505),
- (506, '会员成长值', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 506),
- (507, '会员积分', 5, 'Y', null, 0, null, null, null, 'icon-jifen', 0, 507),
- (508, '积分商城', 5, 'Y', null, 0, null, null, null, 'icon-jifenshangchengb', 0, 508),
- (509, '停车会员', 5, 'Y', null, 1, null, null, 'parkingList', 'icon-tingchechang1', 0, 509),
- (511, '等级设置', 506, 'Y', null, 1, null, null, 'czdengji', null, 0, 511),
- (512, '规则设置', 506, 'Y', null, 1, null, null, 'czguize', null, 0, 512),
- (513, '会员权益', 506, 'Y', null, 1, null, null, 'interestsMembers', null, 0, 513),
- (521, '积分兑换', 507, 'Y', null, 1, null, null, 'duihuan', null, 0, 521),
- (522, '积分规则', 507, 'Y', null, 1, null, null, 'guize', null, 0, 522),
- (523, '积分变更记录', 507, 'Y', null, 1, null, null, 'biangeng', null, 0, 523),
- (531, '商城管理', 508, 'Y', null, 1, null, null, 'jifensc', null, 0, 531),
- (532, '积分券', 508, 'Y', null, 1, null, null, 'jifenq', null, 0, 532),
- (533, '停车券', 508, 'Y', null, 1, null, null, 'tingcheq', null, 0, 533),
-
- (601, '营销统计', 6, 'Y', null, 0, null, null, null, 'icon-stat', 0, 601),
- (602, '优惠券', 6, 'Y', null, 0, null, null, null, 'icon-iconfontyouhuiquan', 0, 602),
- (603, '购物卡', 6, 'Y', null, 0, null, null, null, 'icon-qiapian', 0, 603),
- (604, '营销活动', 6, 'Y', null, 0, null, null, null, 'icon-kanjia', 0, 604),
- (605, '主题营销', 6, 'Y', null, 0, null, null, null, 'icon-qian', 0, 605),
- (606, '渠道投放', 6, 'Y', null, 0, null, null, null, 'icon-piliangtoufang', 0, 606),
- (607, '答题问卷', 6, 'Y', null, 1, null, null, 'questionsettinglist', 'icon-wenjuan', 0, 607),
- (608, '场景投放', 6, 'Y', null, 0, null, null, null, 'icon-icon-test', 0, 608),
- (609, '精准投放', 6, 'Y', null, 0, null, null, null, 'icon-jingzhuntoufang', 0, 609),
- (610, '订单管理', 6, 'Y', null, 0, null, null, 'orderList', 'icon-dingdanguanli', 0, 610),
- (611, '疲劳度设置', 6, 'Y', null, 1, null, null, 'pilaodu', 'icon-pilaojiashi', 0, 612),
- (612, '营销物料', 6, 'Y', null, 1, null, null, 'xiaochengxupath', 'icon-wuliaoguanli-', 0, 611),
-
- (621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 622),
- (622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 623),
- (623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 624),
- (624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 625),
- (625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 626),
- (626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 627),
- (627, '营销分析', 601, 'Y', null, 1, null, null, 'dataZonglan', 'icon-wifi', 0, 621),
-
- (641, '通用券', 602, 'Y', null, 1, null, null, 'tongyong', null, 0, 641),
- (642, '满减券', 602, 'Y', null, 1, null, null, 'manjianlist', null, 0, 642),
- (643, '代金券', 602, 'Y', null, 1, null, null, 'daijinlist', null, 0, 643),
- (644, '礼品券', 602, 'Y', null, 1, null, null, 'lipinlist', null, 0, 644),
- (645, '停车券', 602, 'Y', null, 1, null, null, 'tingchelist', null, 0, 645),
-
- (651, '消费卡', 603, 'Y', null, 1, null, null, 'introducing', null, 0, 651),
-
- (661, '砍价', 604, 'Y', null, 1, null, null, 'bargainlist', null, 0, 661),
- (662, '拼团', 604, 'Y', null, 1, null, null, 'spellgroup', null, 0, 662),
-
- (671, '宣传页', 605, 'Y', null, 1, null, null, 'XuanChuanList', null, 0, 671),
- (672, '互动营销游戏', 605, 'Y', null, 1, null, null, 'gamesetting', null, 0, 672),
-
- (673, '广告大屏', 605, 'Y', null, 1, null, null, 'adscreen', null, 0, 673),
- (674, '专题', 605, 'Y', null, 1, null, null, 'topictoufang', null, 0, 674),
-
- (681, '列表投放', 606, 'Y', null, 1, null, null, 'xiaochengxu', null, 0, 681),
- (682, '限时抢购', 606, 'Y', null, 1, null, null, 'flashsale', null, 0, 682),
- (683, '购物卡频道', 606, 'Y', null, 1, null, null, 'introcardput', null, 0, 683),
- (684, '砍价', 606, 'Y', null, 1, null, null, 'bargainCoupon', null, 0, 684),
- (685, '拼团', 606, 'Y', null, 1, null, null, 'groupbooktoufang', null, 0, 685),
-
- (691, '停车发券', 608, 'Y', null, 1, null, null, 'tingchetoufang', null, 0, 691),
- (692, '核销发券', 608, 'Y', null, 1, null, null, 'hexiaotoufang', null, 0, 692),
- (693, '收银台发券', 608, 'Y', null, 1, null, null, 'paymentb', null, 0, 693),
- (694, '交易发劵', 608, 'Y', null, 1, null, null, 'buycoupon', null, 0, 694),
-
- (701, '精准发券', 609, 'Y', null, 1, null, null, 'jingzhuntoufang', null, 0, 701),
- (702, '标签短信', 609, 'Y', null, 1, null, null, 'msglist', null, 0, 702),
-
- (711, '劵订单', 610, 'Y', null, 1, null, null, 'orderList', null, 0, 711),
- (712, '卡订单', 610, 'Y', null, 1, null, null, 'sellingCardRecord', null, 0, 712),
- (713, '卡消费订单', 610, 'Y', null, 1, null, null, 'consumRecord', null, 0, 713),
-
- (901, '角色管理', 7, 'Y', null, 1, null, null, 'ruleList', 'icon-navicon-yhgl', 0, 901),
- (902, '用户管理', 7, 'Y', null, 1, null, null, 'userList', 'icon-yonghuguanli', 0, 902),
-
- (951, '广告大屏', 9, 'Y', null, 0, null, null, 'bigScreentList', 'icon-navicon-yhgl', 0, 951),
- (961, '大屏管理', 951, 'Y', null, 1, null, null, 'bigScreentList', null, 0, 961)
-
- ;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql
deleted file mode 100644
index 5e18d9fe6..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE wx_template_msg
- ADD COLUMN `custom_param` json DEFAULT null COMMENT '自定义参数' after `type`;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql
deleted file mode 100644
index 1946c6fe5..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-
-ALTER TABLE `wx_template_msg` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-
-UPDATE wx_template_msg
-SET custom_param=
-'{"index":["keyword1","keyword2","keyword3","keyword4","keyword5","keyword6","keyword7"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}元","keyword6":"{keyword6}","keyword7":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword7}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}'
-WHERE type = 1;
-
-UPDATE wx_template_msg
-SET custom_param='{"index":["keyword1","keyword2","keyword3","keyword4"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword4}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}'
-WHERE type = 2;
-UPDATE wx_template_msg
-SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","remark"],"first":"商家{first}的券被核销","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}'
-WHERE type = 102;
-UPDATE wx_template_msg
-SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","keyword4","keyword5","remark"],"first":"您有新的惊喜,请点详情查看","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}'
-WHERE type = 103;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql
deleted file mode 100644
index 160106eed..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE wx_property_contract
- ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年';
-
-ALTER TABLE wx_rent_contract
- ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
deleted file mode 100644
index c836e197f..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_coupon
- ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
-
-UPDATE wx_coupon SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
deleted file mode 100644
index 9fb958e29..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_campaign
- ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
-
-UPDATE wx_campaign SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
deleted file mode 100644
index 9e9237000..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-ALTER TABLE wx_topic
- ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
-
-UPDATE wx_topic SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql
deleted file mode 100644
index b690b621a..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql
+++ /dev/null
@@ -1 +0,0 @@
-update wx_msg_validationcode_model set model_id=500 where name in( '审批通知','待办通知','欠缴账单通知','驳回通知','审批通过通知','待缴账单通知')
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql
deleted file mode 100644
index f3bc7a460..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE wx_property_contract
- ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)';
-
-ALTER TABLE wx_rent_contract
- ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)';
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql
deleted file mode 100644
index 467f4acbf..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `wx_merchant`
-ADD COLUMN `action_desc` VARCHAR(2048) NULL DEFAULT NULL AFTER `introduction`;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql
deleted file mode 100644
index cf51b3867..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-update wx_property_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ;
-update wx_rent_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql
deleted file mode 100644
index dca67ea13..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `mall_user_info`
-ADD INDEX `index_name` (`name` ASC);
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql
deleted file mode 100644
index ebb0de472..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE wx_coupon_channel
- ADD COLUMN qr_code VARCHAR(500) DEFAULT NULL COMMENT '二维码';
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql
deleted file mode 100644
index 23c10f5b7..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql
+++ /dev/null
@@ -1 +0,0 @@
-update wx_msg_validationcode_model set content = '{merName}当期的待缴账单为{price}元,截止日期为{date} ,请登录{app}小程序查看账单并交费。' where type = 7
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql
deleted file mode 100644
index 935786b46..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `wx_weapp_audit_status`
-ADD COLUMN `screen_shot` VARCHAR(250) NULL DEFAULT NULL AFTER `audit_err_code`;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql
deleted file mode 100644
index beb5e85a4..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `wx_rent_contract`
-ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称';
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql
deleted file mode 100644
index f6c1fcb50..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql
+++ /dev/null
@@ -1 +0,0 @@
-update wx_merchant set cover_picture=json_array(img_url) where img_url is not null and (cover_picture is null or cover_picture='');
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql
deleted file mode 100644
index f58146e98..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `mall_permission` SET icon = 'icon-zhangdan4' WHERE id = 401;
-UPDATE `mall_permission` SET icon = 'icon-zhangdanmingxi' WHERE id = 412;
-UPDATE `mall_permission` SET icon = 'icon-zhangdan5' WHERE id = 402;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql
deleted file mode 100644
index 74f21608b..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql
+++ /dev/null
@@ -1,53 +0,0 @@
-DROP TABLE IF EXISTS `sys_monitor`;
-CREATE TABLE `sys_monitor` (
- `id` bigint(20) NOT NULL,
- `name` varchar(50) NOT NULL COMMENT '网址名称',
- `url` varchar(255) NOT NULL COMMENT '网址url',
- `type` tinyint(2) DEFAULT '1' COMMENT '1=网址监控',
- `deploy` tinyint(2) DEFAULT '1' COMMENT '1=dev 2=test 3=release',
- `enable` tinyint(2) DEFAULT '0' COMMENT '0:enable 1:disable',
- `err_msg` varchar(50) DEFAULT NULL COMMENT '错误信息',
- PRIMARY KEY (`id`),
- UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
-) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='网络监控' CHECKSUM=0 DELAY_KEY_WRITE=0;
-
-INSERT INTO `sys_monitor` (`id`,`name`,`url`,`type`,`deploy`,`enable`,`err_msg`) VALUES
-(1, "dev-管理端","https://mall.youlane.cn/api/version", 1, 1, 1, "{name}: {url} 不响应"),
-(2, "dev-C端","https://ciformall.youlane.cn/C/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"),
-(3, "dev-B端","https://biformall.youlane.cn/B/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"),
-(4, "dev-Schedule","http://202.165.179.86:5000/S/version", 1, 1, 1, "{name}: {url} 不响应"),
-(5, "dev-消息服务器","http://202.165.179.86:5001/mq/version", 1, 1, 1, "{name}: {url} 不响应"),
-(6, "dev-websocket服务器","http://202.165.179.86:7100/W/version", 1, 1, 1, "{name}: {url} 不响应"),
-(7, "dev-微信第三方开放平台","https://open.youlane.cn/O/version", 1, 1, 1, "{name}: {url} 不响应"),
-(8, "dev-移动端数据塔台","https://mobile.youlane.cn/#/", 1, 1, 1, "{name}: {url} 不响应"),
-(9, "dev-幸运卡牌","https://game.youlane.cn/luckCard/index.html", 1, 1, 1, "{name}: {url} 不响应"),
-(10, "dev-幸运砸金蛋","https://game.youlane.cn/goldEgg/index.html", 1, 1, 1, "{name}: {url} 不响应"),
-(11, "dev-幸运刮刮乐","https://game.youlane.cn/guaguale/index.html", 1, 1, 1, "{name}: {url} 不响应"),
-(12, "dev-callback","http://202.165.179.86:9100/version", 1, 1, 1, "{name}: {url} 不响应"),
-
-(101, "test-管理端","https://admintest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"),
-(102, "test-C端","https://ctest.malls.iformall.com/C/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"),
-(103, "test-B端","https://btest.malls.iformall.com/B/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"),
-(104, "test-Schedule","https://stest.malls.iformall.com/S/version", 1, 2, 0, "{name}: {url} 不响应"),
-(105, "test-消息服务器","https://stest.malls.iformall.com/mq/version", 1, 2, 0, "{name}: {url} 不响应"),
-(106, "test-websocket服务器","https://stest.malls.iformall.com/W/version", 1, 2, 0, "{name}: {url} 不响应"),
-(107, "test-微信第三方开放平台","https://opentest.malls.iformall.com/O/version", 1, 2, 0, "{name}: {url} 不响应"),
-(108, "test-移动端数据塔台","https://mobiletest.malls.iformall.com/#/", 1, 2, 0, "{name}: {url} 不响应"),
-(109, "test-幸运卡牌","https://gametest.malls.iformall.com/game/luckCard/index.html", 1, 2, 0, "{name}: {url} 不响应"),
-(110, "test-幸运砸金蛋","https://gametest.malls.iformall.com/game/goldEgg/index.html", 1, 2, 0, "{name}: {url} 不响应"),
-(111, "test-幸运刮刮乐","https://gametest.malls.iformall.com/game/guaguale/index.html", 1, 2, 0, "{name}: {url} 不响应"),
-(112, "test-callback","https://callbacktest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"),
-
-(201, "生产环境-管理端","https://admin.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应"),
-(202, "生产环境-C端","https://c.malls.iformall.com/C/api/mall/version", 1, 3, 0, "{name}: {url} 不响应"),
-(203, "生产环境-B端","https://b.malls.iformall.com/B/api/mall/version", 1, 3, 0, "{name}: {url}不响应"),
-(204, "生产环境-Schedule","https://s.malls.iformall.com/S/version", 1, 3, 0, "{name}: {url}不响应"),
-(205, "生产环境-消息服务器","https://s.malls.iformall.com/mq/version", 1, 3, 0, "{name}: {url}不响应"),
-(206, "生产环境-websocket服务器","https://s.malls.iformall.com/W/version", 1, 3, 0, "{name}: {url}不响应"),
-(207, "生产环境-微信第三方开放平台","https://open.malls.iformall.com/O/version", 1, 3, 0, "{name}: {url}不响应"),
-(208, "生产环境-移动端数据塔台","https://mobile.malls.iformall.com/#/", 1, 3, 0, "{name}: {url}不响应"),
-(209, "生产环境-幸运卡牌","https://game.malls.iformall.com/game/luckCard/index.html", 1, 3, 0, "{name}: {url}不响应"),
-(210, "生产环境-幸运砸金蛋","https://game.malls.iformall.com/game/goldEgg/index.html", 1, 3, 0, "{name}: {url}不响应"),
-(211, "生产环境-幸运刮刮乐","https://game.malls.iformall.com/game/guaguale/index.html", 1, 3, 0, "{name}: {url}不响应"),
-(212, "生产环境-callback","https://callback.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应")
-;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql
deleted file mode 100644
index 140b7760b..000000000
--- a/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `wx_property_contract`
-ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称';