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,