Merge branch 'master_after0225' into master_after0423

@@ -1278,6 +1278,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
         } else {
             dataMap.put("includesTransportOrPackaging", "单价中不包含包装费用与运费");
         }
+        //收货人
+        dataMap.put("designatedConsignee", data.getDesignatedConsignee() == null ? "" : data.getDesignatedConsignee());
         //企业类型为经销商
         QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
         vo.setCompanyId(data.getBuyer());