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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

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

@@ -1709,6 +1709,7 @@
         update tb_rst_sales_order_info
         SET
           sales_deliver = #{salesDeliver},
+          order_case_date = #{orderCaseDate},
           sales_deliver_time = NOW()
         WHERE
           sales_post_num = #{salesPostNum}
@@ -2231,7 +2232,7 @@
             tb_rst_sales_order_info
         WHERE
             sales_is_sublist = 1
-        AND sales_shipping_status IN (0, 3, 4, 11)
+        AND sales_shipping_status = 11
         AND sales_status IN (1, 2)
         AND sales_address_info = #{salesAddressInfo}
         AND sales_address_tel = #{salesAddressTel}