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

src/views/emergencyCommandMap/RightSection/JointDuty.vue

@@ -164,7 +164,7 @@ onMounted(() => {
      listData.value = res.data;
   });
   */
-  qrCodeUrl.value = import.meta.env.VITE_APP_BASE_API2 + 'api/event_management/checkin/qrcode?event_id=' + eventId.value;
+  qrCodeUrl.value = import.meta.env.VITE_APP_BASE_API2 + 'api/qrcode/event/checkin?event_id=' + eventId.value;
   nextFetchData();
 });
 </script>