Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/PanFactoryOrder.java

@@ -117,7 +117,6 @@ public class PanFactoryOrder extends BaseEntity {
 	private String receiverName;
 
 	@ApiModelProperty(value = "收货人联系方式")
-	@NotEmpty(message = "收货人联系方式不能为空")
 	private String receiverMobile;
 
 	@ApiModelProperty(value = "收货人省份")
@@ -132,7 +131,6 @@ public class PanFactoryOrder extends BaseEntity {
 	private String receiverArea;
 
 	@ApiModelProperty(value = "收货人详细地址")
-	@NotEmpty(message = "收货人详细地址不能为空")
 	private String receiverAddress;
 
 	@ApiModelProperty(value = "终端客户电话号码")

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java

@@ -136,7 +136,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		//请求参数
 		logger.info("##############handleData: 推送包件状态请求参数 {}",s);
 		//处理逻辑
-		String result =  HttpRequest.post(panFactoryProperties.getUrl()+"/hitf/v1/rest/invoke?namespace=HZERO&serverCode=HUITONG_MID_RECEIVE")
+		String result =  HttpRequest.post(panFactoryProperties.getUrl()+"/hitf/v1/rest/invoke?namespace=HZERO&serverCode=OPEN&interfaceCode=HUITONG_MID_RECEIVE")
 			.header("Authorization","Bearer "+panToken)
 			.header("Content-Type","application/json")
 			.body(s).timeout(5 * 1000)