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
new file mode 100644
index 000000000..427b6e817
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql
@@ -0,0 +1,4 @@
+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/V201905061425__L_VAL_MSG_MODEL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql
new file mode 100644
index 000000000..6d990f8ef
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql
@@ -0,0 +1,78 @@
+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
new file mode 100644
index 000000000..b95b706f1
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql
@@ -0,0 +1,2 @@
+delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知');
+alter table wx_msg_model drop column email_bg_img;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
index b05947103..4944b3a15 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
@@ -10,15 +10,15 @@ import java.util.List;
@Table(name = "wx_msg_model")
public class WxMsgModel implements Serializable {
private static final long serialVersionUID = 1L;
-
+
@Id
- protected Long id;
-
- @Transient
- protected List ids;
- @Transient
- protected String sortColumns;
-
+ protected Long id;
+
+ @Transient
+ protected List ids;
+ @Transient
+ protected String sortColumns;
+
public Long getId() {
return id;
}
@@ -26,20 +26,20 @@ public class WxMsgModel implements Serializable {
public void setId(Long id) {
this.id = id;
}
-
+
public String getSortColumns() {
return sortColumns;
}
-
+
public List getIds() {
return ids;
}
public void setIds(List ids) {
this.ids = ids;
}
-
-
-
+
+
+
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@@ -61,15 +61,6 @@ public class WxMsgModel implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId")
private Integer modelId;
- private String emailBgImg;
-
- public String getEmailBgImg() {
- return emailBgImg;
- }
-
- public void setEmailBgImg(String emailBgImg) {
- this.emailBgImg = emailBgImg;
- }
public String getTenantId() {
return tenantId;
@@ -119,12 +110,12 @@ public class WxMsgModel implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
- ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
- ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
- ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC")
- ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC")
- ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
- ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
+ ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
+ ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
+ ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC")
+ ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC")
+ ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
+ ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` DESC")
;
@@ -143,7 +134,7 @@ public class WxMsgModel implements Serializable {
return this.getValue();
}
}
-
+
public void setSortColumns(WxMsgModel.Field... fields)
{
if (fields == null || fields.length == 0) {
@@ -161,9 +152,9 @@ public class WxMsgModel implements Serializable {
}
this.sortColumns = sb.toString();
-
+
}
-
+
public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
@@ -181,3 +172,4 @@ public class WxMsgModel implements Serializable {
}
}
}
+
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
index b9541ab06..fb1a7c863 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
@@ -11,15 +11,15 @@ import java.util.List;
@Table(name = "wx_msg_validationcode_model")
public class WxMsgValidationcodeModel implements Serializable {
private static final long serialVersionUID = 1L;
-
+
@Id
- protected Long id;
-
- @Transient
- protected List ids;
- @Transient
- protected String sortColumns;
-
+ protected Long id;
+
+ @Transient
+ protected List ids;
+ @Transient
+ protected String sortColumns;
+
public Long getId() {
return id;
}
@@ -29,16 +29,16 @@ public class WxMsgValidationcodeModel implements Serializable {
public String getSortColumns() {
return sortColumns;
}
-
+
public List getIds() {
return ids;
}
public void setIds(List ids) {
this.ids = ids;
}
-
-
-
+
+
+
/*名称**/
@io.swagger.annotations.ApiModelProperty(value="名称",name="name")
private String name;
@@ -67,6 +67,17 @@ public class WxMsgValidationcodeModel implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId")
private String tenantId;
+ @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg")
+ private String emailBgImg;
+
+ public String getEmailBgImg() {
+ return emailBgImg;
+ }
+
+ public void setEmailBgImg(String emailBgImg) {
+ this.emailBgImg = emailBgImg;
+ }
+
public String getName() {
return name;
}
@@ -127,15 +138,15 @@ public class WxMsgValidationcodeModel implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
- ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
- ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC")
- ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC")
- ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
- ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
- ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC")
- ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC")
- ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
- ;
+ ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
+ ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC")
+ ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC")
+ ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
+ ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
+ ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC")
+ ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC")
+ ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
+ ;
private String value;
Field(String value){
this.value = value;
@@ -151,7 +162,7 @@ public class WxMsgValidationcodeModel implements Serializable {
return this.getValue();
}
}
-
+
public void setSortColumns(Field... fields)
{
if (fields == null || fields.length == 0) {
@@ -167,9 +178,9 @@ public class WxMsgValidationcodeModel implements Serializable {
sb.append(",");
sb.append(fields[k].toString());
}
-
+
}
-
+
public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
@@ -187,3 +198,4 @@ public class WxMsgValidationcodeModel implements Serializable {
}
}
}
+
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
index fb4b5914a..6ab289173 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
@@ -1,10 +1,12 @@
package com.iformall.service.msg.impl;
+import com.iformall.domain.po.WxMsgValidationcodeModel;
import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.domain.po.msg.MailMsg;
-import com.iformall.domain.po.WxMsgModel;
import com.iformall.mapper.WxMsgModelMapper;
+import com.iformall.mapper.WxMsgValidationcodeModelMapper;
import com.iformall.service.msg.MsgSendService;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,6 +19,7 @@ import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import javax.mail.internet.MimeMessage;
import java.io.File;
+import java.util.List;
import java.util.Map;
/**
@@ -30,25 +33,26 @@ public class SendEmailServiceImpl implements MsgSendService {
@Autowired
private JavaMailSender sender;
-
@Value("${spring.mail.username}")
private String from;
-
@Autowired
private WxMsgModelMapper wxMsgModelMapper;
+ @Autowired
+ private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper;
@Override
public void send(BaseMsg baseMsg) throws Exception{
MailMsg mailMsg = (MailMsg)baseMsg;
//根据模板替换动态内容
if(mailMsg.getModelId() != null){
- WxMsgModel msgModel = new WxMsgModel();
+ WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel();
msgModel.setTenantId(mailMsg.getTenantId());
- msgModel.setModelId(mailMsg.getModelId());
- WxMsgModel wxMsgModel = wxMsgModelMapper.findOneByModelId(msgModel);
- if(wxMsgModel == null){
+ msgModel.setType(mailMsg.getModelId());
+ List modelList = wxMsgValidationcodeModelMapper.findList(msgModel);
+ if(CollectionUtils.isEmpty(modelList)){
throw new Exception("模板id:"+mailMsg.getModelId()+"不存在");
}
+ WxMsgValidationcodeModel wxMsgModel = modelList.get(0);
String msg = wxMsgModel.getContent();
for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) {
@@ -105,3 +109,4 @@ public class SendEmailServiceImpl implements MsgSendService {
}
}
}
+
diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
index 0c6639c22..b86e3a5bd 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
@@ -10,64 +10,63 @@
-
-
+
- `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`,email_bg_img
+ `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`
- where 1 = 1
-
-
- and `id` = #{id}
-
-
-
-
- and `tenant_id`=#{tenantId}
-
-
-
+ where 1 = 1
+
+
+ and `id` = #{id}
+
+
+
+
+ and `tenant_id`=#{tenantId}
+
+
+
- and `name` = #{name}
-
-
-
-
- and `signature` = #{signature}
-
-
-
-
- and `content` = #{content}
-
-
-
-
- and `createtime` = #{createtime}
-
-
-
-
- and `status` = #{status}
-
+ and `name` = #{name}
+
+
+
+
+ and `signature` = #{signature}
+
+
+
+
+ and `content` = #{content}
+
+
+
+
+ and `createtime` = #{createtime}
+
+
+
+
+ and `status` = #{status}
+
and `model_id` = #{modelId}
- and id in
+ and id in
- #{idItem}
+ #{idItem}
-
+
order by ${sortColumns}
-
+
-
-
-
-
+
+
+
+
+
diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
index 4d5379181..c73e5a6a5 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
@@ -12,42 +12,44 @@
+
+
-
+
- `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`
+ `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img
- where 1 = 1
- and `id` = #{id}
- and `name` = #{name}
- and `signature` = #{signature}
- and `content` = #{content}
- and `createtime` = #{createtime}
- and `status` = #{status}
- and `minutes` = #{minutes}
- and `model_id` = #{modelId}
+ where 1 = 1
+ and `id` = #{id}
+ and `name` = #{name}
+ and `signature` = #{signature}
+ and `content` = #{content}
+ and `createtime` = #{createtime}
+ and `status` = #{status}
+ and `minutes` = #{minutes}
+ and `model_id` = #{modelId}
and `type` = #{type}
and `tenant_id` = #{tenantId}
- and id in
+ and id in
- #{idItem}
+ #{idItem}
-
+
order by ${sortColumns}
-
+
-
-
-
-
-
-
+
+
+
+
+
+