From 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 23 Mar 2021 13:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
index 22d0cdb..37ce46c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -79,4 +79,19 @@
}
+ /**
+ * 获取包裹违禁品明细分页数据，远程调用api获取数据
+ * @param conditionVo 请求参数对象
+ * @param response
+ * @return
+ */
+ @GetMapping("/getParcelkindDetailPage")
+ public R getParcelkindDetailPage(ConditionVo conditionVo,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(parcelService.getParcelkindDetailPage(conditionVo));
+ }
+
+
}
--
Gitblit v1.9.3