From 0d1728aec00c6d5c0fa86572a39da3ffe3d81bf5 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 25 Oct 2024 10:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/app/entity/BraceletEntity.java    | 2 ++
 .../bonus-app/src/main/resources/mapper/BraceletMapper.xml    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java
index b482f17..068c4bf 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/BraceletEntity.java
@@ -22,6 +22,8 @@ public class BraceletEntity {
      */
     private  int boxNum;
 
+    private String shName;
+
     /**
      * 总容量
      */
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml
index 1168e3c..8b531b7 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/BraceletMapper.xml
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="getBoxInfo" resultType="com.bonus.app.entity.BraceletEntity">
-        select blt.sh_code shCode,blt.id devId,peopel_type userType, blt.bid_id userId,
+        select blt.sh_code shCode,blt.id devId,peopel_type userType, blt.bid_id userId,blt.sh_name,shName,
                tpp.lat sgLat ,tpp.lon  sgLon,team.team_name teamName,blt.face_status faceStatus,
                case
                    WHEN  peopel_type=0 then tpe.name
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="getBoxInfoBid" resultType="com.bonus.app.entity.BraceletEntity">
-        select blt.sh_code shCode,blt.id devId,peopel_type userType, blt.bid_id userId,
+        select blt.sh_code shCode,blt.id devId,peopel_type userType, blt.bid_id userId,blt.sh_name,shName,
         tpp.lat sgLat ,tpp.lon  sgLon,blt.face_status faceStatus,
         case
         WHEN  peopel_type=0 then tpe.name