Merge remote-tracking branch 'origin/main'

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/UrkSendMapper.xml

@@ -83,6 +83,12 @@
                dev_model devModel,on_line onLine
         from pm_att_device
             where pro_id=#{proId} and is_active=1
+                  <if test='teamId==0 or teamId=="0"'>
+                      and team_id is NULL
+                  </if>
+                 <if test='supId==0 or supId=="0"'>
+                     and sub_id is NULL  and team_id is NULL
+                  </if>
                 <if test='supId!=null and supId!=0 and supId!="0"'>
                     and sub_id=#{supId}
                 </if>