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-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -137,7 +137,7 @@
             <table class="table table-border table-bordered table-bg table-hover table-sort">
                 <thead>
                 <tr class="text-c">
-                    <th width="10"></th>
+                    <th width="10"><input type="checkbox" class="selectAll" id="selectAll" value="selectAll" ></th>
                     <th width="50">销售公司</th>
                     <th width="50">店铺名称</th>
                     <th width="50">Efast订单号</th>