更新sql修改。

common/src/main/resources/mapper/base/OrderInfo.xml

@@ -122,10 +122,10 @@
 				ticket_type = #{ticketType,jdbcType=VARCHAR},
 			</if>
 			<if test="goodsTicket != null">
-				goods_ticket = #{goodsTicket,jdbcType=DECIMAL}
+				goods_ticket = #{goodsTicket,jdbcType=DECIMAL},
 			</if>
 			<if test="mergeOrderId != null">
-				merge_order_id = #{mergeOrderId,jdbcType=VARCHAR}
+				merge_order_id = #{mergeOrderId,jdbcType=VARCHAR},
 			</if>
 		</set>
 	where id_=#{id}