Merge branch 'feature-recommend2' into 'developer'

跟进记录增加跟进类型

See merge request !2863

haoban-manage3-service/src/main/resources/mapper/contact/TabContactFollowMapper.xml

@@ -116,7 +116,7 @@
         INSERT INTO tab_contact_follow (follow_id,member_id, clerk_id, clerk_code,follow_type, follow_remark, follow_material, goods_info, follow_time, enterprise_id)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.followId},#{item.memberId}, #{item.clerkId}, #{item.clerkCode}, #{followType},#{item.followRemark}, #{item.followMaterial}, #{item.goodsInfo}, #{item.followTime}, #{item.enterpriseId})
+            (#{item.followId},#{item.memberId}, #{item.clerkId}, #{item.clerkCode}, #{item.followType},#{item.followRemark}, #{item.followMaterial}, #{item.goodsInfo}, #{item.followTime}, #{item.enterpriseId})
         </foreach>
     </insert>