Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -241,7 +241,7 @@
 
 
 
-    <update id="updateDate" parameterType="java.util.List">
+    <update id="updateList" parameterType="java.util.List">
 		<foreach collection="list" item="item" index="index" separator=",">
           update sg_fee_detail_jkxl set
              <if test="item.rgFtFee != null and item.rgFtFee != ''">
@@ -284,7 +284,7 @@
 		</foreach>
     </update>
 
-	<update id="updateList" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
+	<update id="updateDate" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
 		update sg_fee_detail_jkxl set
 		<if test="rgFtFee != null and rgFtFee != ''">
 			rg_fee_ft = #{rgFtFee},