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

maven

4 天以前 db807b8e9464af69217f813240e55d9e9b3b4cdb

 src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java

@@ -42,6 +42,6 @@
        if (purchaseReturnOrderDto.getIsDefaultNo()) {
            purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
        }
        return AjaxResult.success(purchaseReturnOrdersService.save(purchaseReturnOrderDto));
        return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
    }
}