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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

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

@@ -260,9 +260,9 @@
                     </div>
 
                     <div class="row cl" id="recipientAddressText" style=" margin-top: 20px;">
-                        <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>订单备注：</label>
+                        <label class="form-label col-1 col-sm-1" style="width: 110px;">商家备注：</label>
                         <div class="formControls col-10 col-sm-10">
-                            <textarea name="salesAdminRemark" id="salesAdminRemark" cols="" rows="2" class="textarea" placeholder="订单备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
+                            <textarea name="salesAdminRemark" id="salesAdminRemark" cols="" rows="2" class="textarea" placeholder="商家备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
                         </div>
                     </div>