From 457e219b261a12387e423d331f4ec4841b7ac32d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 26 Aug 2021 11:58:09 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/controller/OrderController.java | 4 +---
gc-order/src/main/java/com/xzx/gc/order/dto/InviteUserOrderDetailsDto.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/OrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/OrderController.java
index 4efdaba..589f35a 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/OrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/OrderController.java
@@ -1189,9 +1189,7 @@
@ApiResponse(code = 200, message = "success", response = InviteUserOrderVo.class)
)
@PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/user/inviteUserQsOrderDetails.json")
- public JsonResult<Object> inviteUserQsOrderDetails(@RequestBody InviteUserOrderDetailsDto detailsDto, HttpServletRequest request) {
- String userId = getUserId(request);
- detailsDto.setUserId(userId);
+ public JsonResult<Object> inviteUserQsOrderDetails(@RequestBody InviteUserOrderDetailsDto detailsDto) {
return JsonResult.success(orderService.inviteUserOrderDetail(detailsDto));
}
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/InviteUserOrderDetailsDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/InviteUserOrderDetailsDto.java
index 18ac4b4..80328c7 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/InviteUserOrderDetailsDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/InviteUserOrderDetailsDto.java
@@ -18,7 +18,7 @@
@ApiModelProperty(value = "每一页数量", required = true)
private int limit;
- @ApiModelProperty(hidden = true)
+ @ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "1-骑手单 2-集货员单")
--
Gitblit v1.9.1