Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-order/xx-order-server/src/main/resources/mapper/OrderVehicaleCrosstownMapper.xml

@@ -26,6 +26,7 @@
       <result column="deduction_cost" jdbcType="INTEGER" property="deductionCost"/>
       <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
       <result column="user_license_id" jdbcType="VARCHAR" property="userLicenseId"/>
+      <result column="violate_amount_detail" jdbcType="VARCHAR" property="violateDetail"/>
   </resultMap>
     <resultMap id="orderMap" type="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         <result column="id" javaType="java.lang.Integer" property="id"/>
@@ -34,20 +35,20 @@
                      javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
     </resultMap>
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
-        select *
-        from order_vehicle_crosstown
+        select o.*, o.violate_amount_detail violateDetail
+        from order_vehicle_crosstown o
         <where>
             <if test="status != null">
-                and status = #{status}
+                and o.status = #{status}
             </if>
             <if test="type != null">
-                and type = #{type}
+                and o.type = #{type}
             </if>
             <if test="orderId != null">
-                and order_id = #{orderId}
+                and o.order_id = #{orderId}
             </if>
             <if test="orderNo != null">
-                and order_no = #{orderNo}
+                and o.order_no = #{orderNo}
             </if>
         </where>
     </select>