Browse Source

[merge][修改]:修复mapper issue

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
53f2020156
2 changed files with 0 additions and 8 deletions
  1. +0
    -4
      mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
  2. +0
    -4
      mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml

+ 0
- 4
mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml View File

@@ -14,11 +14,7 @@
</resultMap>

<sql id="allColumns">
<<<<<<< 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
</sql>

<sql id="dynamicWhereConditions">


+ 0
- 4
mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml View File

@@ -17,11 +17,7 @@
</resultMap>

<sql id="allColumns">
<<<<<<< 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
</sql>

<sql id="dynamicWhereConditions">


Loading…
Cancel
Save