diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
index c2b6ceac3..849b1882b 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
@@ -14,11 +14,7 @@
-<<<<<<< HEAD
- `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`
-=======
`id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`
->>>>>>> refs/tags/jenkins-back-end-1724
diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
index c9ee50de7..e9176ace1 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
@@ -17,11 +17,7 @@
-<<<<<<< HEAD
- `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img
-=======
`id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img
->>>>>>> refs/tags/jenkins-back-end-1724