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

Junjie

2023-10-31 e6ed9e8a9f24683e8ea4e9fc2c82b1d4e24bb00a

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