Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/orderMapper.xml

@@ -794,7 +794,7 @@
         ON
         a.sales_id = b.item_order_id
         WHERE
-        a.sales_deal_code = #{orderDealCode}
+        a.sales_deal_code like CONCAT('%',#{orderDealCode},'%')
     </select>
     <!--querySalesOrderItemListBySalesId 查询订单项-->
     <select id="querySalesOrderItemListBySalesId" parameterType="java.lang.Integer" resultMap="salesOrderResult">