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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -1934,7 +1934,7 @@
         </set>
         where sales_post_num = #{salesPostNum}
     </update>
-<!--根据收件人信息查询字母单-->
+<!--根据收件人信息查询子母单-->
     <select id="listSalesOrderByAddr" parameterType="SalesOrder" resultType="SalesOrder">
         SELECT
             *
@@ -1947,6 +1947,7 @@
         AND sales_address_info = #{salesAddressInfo}
         AND sales_address_tel = #{salesAddressTel}
         AND sales_address_name = #{salesAddressName}
+        AND sales_post_firm = #{salesPostFirm}
     </select>
 <!--查询子订单数量-->
     <select id="listSublistCount" parameterType="Integer" resultType="SalesOrder">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1198,6 +1198,7 @@ public class AdminSalesOrderController {
             isOrder.setSalesAddressInfo(order.getSalesAddressInfo());
             isOrder.setSalesAddressTel(order.getSalesAddressTel());
             isOrder.setSalesAddressName(order.getSalesAddressName());
+            isOrder.setSalesPostFirm(order.getSalesPostFirm());
             List<SalesOrder> listOrder = salesOrderService.listSalesOrderByAddr(isOrder);
             if(listOrder != null &&  listOrder.size() > 0){
                 salesOrder.setSalesIsSublist(2);