From 77620e883c248f042b62a1d3c59c0f312d4b5741 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 09:36:49 +0800
Subject: [PATCH] Merge branch 'dev_天津_君歌化工' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_天津_君歌化工

---
 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 8318580..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","orderNo");
+        String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
         paymentShipping.setOrderNo(ord);
         boolean save = paymentShippingService.save(paymentShipping);
         return save ? success() : error();

--
Gitblit v1.9.3