From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 6c1d2e7..bccf4af 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -363,7 +363,7 @@
@ManagerAuth(memo = "鎵嬪姩涓婁紶璁㈠崟")
@Transactional
public R report(@RequestParam Long orderId){
- orderService.report(orderId,getUserId());
+ orderService.report(orderId,getUser().getUsername());
return R.ok();
}
--
Gitblit v1.9.1