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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/postOrderNumMapper.xml

@@ -140,7 +140,7 @@
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
-            AND sales_batch_id != 'KS00000000000001'
+            sales_batch_id != 'KS00000000000001'
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>
@@ -284,7 +284,7 @@
         LEFT JOIN tb_rst_sys_admin sa ON t.sales_admin_id = sa.admin_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
-            AND sales_batch_id != 'KS00000000000001'
+            sales_batch_id != 'KS00000000000001'
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>