Merge tag 'refs/tags/jenkins-back-end-578' into release

develop

mallinkService/src/main/resources/mapper/WxCampaignMapper.xml

@@ -30,7 +30,7 @@
 	</sql>
 
     <sql id="allCHeadColumns">
-		`id`,`tenant_id`,`cover_img`,`title`,`sort_num`
+		`id`,`tenant_id`,`cover_img`,`title`,`type`,`sort_num`
 	</sql>
 
     <sql id="allAHeadColumns">