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

gongchunyi

2026-04-13 f4d6d9d7ae1d0f1af6937dd7a2761056e46611c2

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