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/cm/mapper/salesOrderMapper.xml

@@ -157,8 +157,8 @@
         <if test="isDeliverGoods !=null and isDeliverGoods !=''">
           AND sales_shipping_status = #{isDeliverGoods}
         </if>
-        <if test="storeName !=null and storeName !=''">
-          AND sales_store_id = #{storeName}
+        <if test="salesStoreId !=null and salesStoreId !=''">
+          AND sales_store_id = #{salesStoreId}
         </if>
         <if test="salesId !=null">
           o.sales_id like CONCAT('%',#{salesId},'%')