Merge branch 'dev/lanpingxiong' into 'master'

# 商家端 行程分页查询接口优化

See merge request hewei/Jumeirah!76

common/src/main/resources/mapper/StrokeMapper.xml

@@ -192,7 +192,7 @@
             INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
             <where>
                 s.mc_id = #{mcId}
-                s.is_discount = #{mcStrokePageParam.isDiscount}
+                AND s.is_discount = #{mcStrokePageParam.isDiscount}
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                     AND s.status = #{mcStrokePageParam.status}
                 </if>