diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907311830__L_ALTER_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201907311830__L_ALTER_BILL.sql
new file mode 100644
index 000000000..2016e90e2
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201907311830__L_ALTER_BILL.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `wx_msg_validationcode_model`
+ADD COLUMN `msg_type` INT(1) NULL DEFAULT NULL COMMENT '1短信2邮件';
+
+ALTER TABLE `wx_msg_validationcode_model`
+ADD COLUMN `role_type` INT(1) NULL DEFAULT NULL COMMENT '0通用1管理员2商户端3消费者';
+
+update wx_msg_validationcode_model set msg_type = 1 where content not like '<%';
+update wx_msg_validationcode_model set msg_type = 2 where content like '<%';
+
+update wx_msg_validationcode_model set role_type = 2 where name in('账单待缴模板','账单欠缴模板','商户分账账户新增通知商户','商户分账账户变更通知商户','商户分账账户删除提醒','待缴账单通知','限时活动报名成功','限时活动参加提醒','欠缴账单通知');
+update wx_msg_validationcode_model set role_type = 3 where name in('场景投放','限时活动报名成功','限时活动参加提醒','');
+update wx_msg_validationcode_model set role_type = 1 where name in('审批通过通知','审批通知','待办通知','驳回通知','审批通知','代办通知','通过审批通知','审批通过通知');
+update wx_msg_validationcode_model set role_type = 0 where name in('验证码');
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 9663482da..13144bca2 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
@@ -48,8 +48,10 @@ public class WxMsgValidationcodeModel extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="发送开关 0开1关",name="open")
private Integer open;
- @io.swagger.annotations.ApiModelProperty(value="消息类型 0全部 1短信 2邮箱",name="open")
- @Transient
+ @io.swagger.annotations.ApiModelProperty(value="消息类型 0全部 1短信 2邮箱",name="msgType")
private Integer msgType;
+
+ @io.swagger.annotations.ApiModelProperty(value="0通用1管理员2商户端3消费者",name="roleType")
+ private Integer roleType;
}
diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
index 962400733..5389fd157 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
@@ -15,10 +15,12 @@
+
+
- `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img,`open`
+ `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img,`open`,msg_type,role_type