Merge remote-tracking branch 'origin/main' into main

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java

@@ -67,6 +67,7 @@ public class KqCmdBean {
     private String phone;
 
     private String createTime;
+    private String isHand;
 
     public KqCmdBean() {
     }

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

@@ -4,11 +4,13 @@
 
     <select id="getUserByDeviceId" resultType="com.bonus.bmw.domain.vo.KqCmdBean">
         select
-        user_id as worker_id,
-        user_name as worker_name,
-        user_phone as phone,
-        dev_code as device_code
-        from kq_user_list
+        kul.user_id as worker_id,
+        kul.user_name as worker_name,
+        kul.user_phone as phone,
+        kul.dev_code as device_code,
+        if(bwem.worker_id is null,1,0) as isHand
+        from kq_user_list kul
+        LEFT JOIN bm_worker_ein_msg bwem ON kul.user_id = bwem.worker_id and bwem.pro_id = #{proId}
         where dev_code = #{deviceCode}
     </select>