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

liyong

2026-04-30 a6ff41048bbdd5b8519a3e21e9232a152d179dfc

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

@@ -42,7 +42,7 @@
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
        if (purchaseReturnOrderDto.getIsDefaultNo()) {
            purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
            purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL","no"));
        }
        return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
    }