Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-08 4c96637a005891c709662ae84edd072ad9a4a57d

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java

@@ -36,7 +36,7 @@
    
            @Override
            public R<TChargingGun> getChargingGunById(Integer id) {
                throw new RuntimeException("根据id获取充电枪失败：" + throwable.getMessage());
                return R.fail("根据id获取充电枪失败：" + throwable.getMessage());
            }

            @Override
@@ -49,6 +49,11 @@
                return R.fail("根据枪编号获取充电枪失败：" + throwable.getMessage());
            }

            @Override
            public R<String> updateChargingGunById(TChargingGun chargingGun) {
                return R.fail("编辑充电枪失败：" + throwable.getMessage());
            }

        };
    }
}