Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-10-31 3dd2b439ffa1eb8c3bad1fff9a71055138e0b957

 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();
    }