Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-02-23 3bee17a52f3ee1f493048465f3e07b31c2102ee5

 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java

@@ -32,7 +32,6 @@
    /*发货订单明细查询*/
    @PostMapping("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        System.out.println(orderDetail.getDeliveryDetail().getDeliveryId());
        return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
    }

@@ -45,7 +44,6 @@
    /*发货订单明细查询*/
    @PostMapping("/getseletShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getseletShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        System.out.println(orderDetail);
        return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
    }

@@ -61,7 +59,6 @@
    }
    @PostMapping("/updateDeliveryToExamine")
    public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
        System.out.println(object);
        if(deliveryService.updateDeliveryToExamine(object)){
            return Result.seccess();