From 91e0a57a7dbbbf0d3ae0c484238fb289fb432252 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 四月 2026 09:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index c67d438..dabd7ac 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -43,7 +43,7 @@
@ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
- String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD");
+ String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
return save ? success() : error();
--
Gitblit v1.9.3