From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index ca128ff..a5d0e85 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -195,6 +195,7 @@
     public Object listAll(Integer id, String merchantNumber,String name) throws Exception {
         TOperator byId = operatorService.getById(id);
         byId.setMerchantNumber(merchantNumber);
+        byId.setMerchantName(name);
         operatorService.updateById(byId);
         ResultUtil resultUtil = payMoneyUtil.addReceiver(merchantNumber, name);
         if (resultUtil.getCode() == 500){

--
Gitblit v1.7.1