From 70082014b9b5c62f2edee1301343b3e54cfdc72e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 11:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index f320a87..dcea1b1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -144,6 +144,7 @@
         String code_prefix = "https://mxcd.zhinenganguan.com?No=";
         QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
         qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+        qrCodeDelivery.setCharging_gun_code(dto.getCode());
         qrCodeDelivery.setCode_format(1);
         qrCodeDelivery.setPrefix_length(code_prefix.length());
         qrCodeDelivery.setCode_prefix(code_prefix);
@@ -181,6 +182,7 @@
         String code_prefix = "https://mxcd.zhinenganguan.com?No=";
         QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
         qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+        qrCodeDelivery.setCharging_gun_code(dto.getCode());
         qrCodeDelivery.setCode_format(1);
         qrCodeDelivery.setPrefix_length(code_prefix.length());
         qrCodeDelivery.setCode_prefix(code_prefix);

--
Gitblit v1.7.1