Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 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){