From 756a4201880e9208d395526f18cfd015aa3ff6a7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 03 十一月 2024 23:36:58 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 4127578..f52b0f1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -256,8 +256,10 @@
 		
 		List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
 		for (TChargingGun chargingGun : list) {
-			chargingGun.setFullNumber(chargingPile.getCode() + chargingGun.getCode());
-			chargingGunService.updateById(chargingGun);
+			TChargingGun chargingGun1 = new TChargingGun();
+			chargingGun1.setId(chargingGun.getId());
+			chargingGun1.setFullNumber(chargingPile.getCode() + chargingGun.getCode());
+			chargingGunService.updateById(chargingGun1);
 			
 			//下发硬件充电二维码
 			String code_prefix = "https://mxcd.zhinenganguan.com?No=";

--
Gitblit v1.7.1