Merge branch 'master' into dev-xym-source

# Conflicts:
#	we-com-server/src/main/resources/mapper/HistoryMessageMapper.xml

we-com-server/src/main/resources/mapper/HistoryMessageMapper.xml

@@ -73,7 +73,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, corp_id, user_id, staff_id, video_id, attachment_idx, `status`, send_time, is_delete, 
+    id, corp_id, user_id, staff_id, video_id, attachment_idx, `status`, send_time, is_delete,
     `source`, create_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.wecom.model.po.HistoryMessageExample" resultMap="BaseResultMap">