From 5c80df9e5d6f0cf4424f07c08e45947c25b8c2f3 Mon Sep 17 00:00:00 2001
From: liu <1085918938@qq.com>
Date: Tue, 15 Jul 2025 23:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A1>=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E5=95=86=E4=BA=A7=E5=93=81=E8=B4=B9=E7=8E=87;2>=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9C=8D=E5=8A=A1=E5=95=86;3>=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/payment/sys/domain/bo/SysSydBo.java | 2 +-
 .../mapper/payment/channel/BusChannelProductMapper.xml        | 4 ++--
 .../mapper/payment/operator/BusOperatorProductMapper.xml      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/sys/domain/bo/SysSydBo.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/sys/domain/bo/SysSydBo.java
index cf6cf08..91902a3 100644
--- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/sys/domain/bo/SysSydBo.java
+++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/sys/domain/bo/SysSydBo.java
@@ -33,7 +33,7 @@ SysSydBo extends BaseEntity {
     /**
      * 结算中心编号
      */
-    @NotBlank(message = "结算中心编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "结算中心编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String no;
 
     /**
diff --git a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/channel/BusChannelProductMapper.xml b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/channel/BusChannelProductMapper.xml
index 8a518a1..35991d9 100644
--- a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/channel/BusChannelProductMapper.xml
+++ b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/channel/BusChannelProductMapper.xml
@@ -14,8 +14,8 @@
             t4.NO syd_no,
             t4.gsmc service_name,
             t1.bus_type,
-            t2.cost_service_charge cost_service_charge,
-            t2.service_charge,
+            t2.service_charge service_charge,
+            t1.service_charge as cost_service_charge,
             t1.charge_mode,
             t1.settlement_style,
             t1.max_month,
diff --git a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/operator/BusOperatorProductMapper.xml b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/operator/BusOperatorProductMapper.xml
index 71a6b6e..67f5f28 100644
--- a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/operator/BusOperatorProductMapper.xml
+++ b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/operator/BusOperatorProductMapper.xml
@@ -14,8 +14,8 @@
             t4.NO syd_no,
             t4.gsmc service_name,
             t1.bus_type,
-            t1.service_charge cost_service_charge,
-            t2.service_charge,
+            t2.service_charge service_charge,
+            t1.service_charge as cost_service_charge,
             t1.charge_mode,
             t1.settlement_style,
             t1.max_month,