From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
index ac3be77..9ae1359 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
@@ -11,6 +11,7 @@
 public class QrCodeDelivery {
 
     private String charging_pile_code; // 桩编码
+    private String charging_gun_code; // 枪编码
     private Integer code_format; // "0:第一种前缀+桩编号  1:第二种前缀+桩编号+枪编号"
     private Integer prefix_length; // 二维码前缀长度长度最大不超过200 字节
     private String code_prefix; // 如:“www.baidu.com?No=”

--
Gitblit v1.7.1