diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java
index ff6f9c5..b970d0c 100644
--- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java
+++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java
@@ -154,4 +154,7 @@ public class Reservation extends BaseEntity<Reservation> {
     @TableField(exist = false)
     private RoomContent roomContent;
 
+    @TableField(exist = false)
+    private Long equipmentId;
+
 }
diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java
index db21616..2aa2d23 100644
--- a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java
+++ b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java
@@ -98,4 +98,12 @@ public class RoomEquipmentServiceImpl extends ServiceImpl<RoomEquipmentMapper, R
         wrapper.eq("equipment_id",id);
         return roomEquipmentMapper.selectOne(wrapper);
     }
+
+    @Override
+    public RoomEquipment selectRoomId(Long roomId) {
+
+        QueryWrapper<RoomEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("room_id",roomId);
+        return roomEquipmentMapper.selectOne(wrapper);
+    }
 }
diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
index c6344e5..6ae7199 100644
--- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
+++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
@@ -49,6 +49,9 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
     @Autowired
     private IRoomService roomService;
 
+    @Autowired
+    private IRoomEquipmentService roomEquipmentService;
+
     @Autowired
     private IBuildingDetailService buildingDetailService;
 
@@ -383,12 +386,15 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
     @Override
     public List<Reservation> todayMeeting(RoomContent roomContent) {
 
+
         //查询当前之前以后，当前时间是否包含在会议室
         List<Reservation> reservations = reservationMapper.todayMeeting(roomContent.getId());
         for (Reservation reservation : reservations) {
             Long userId = reservation.getUserId();
             IcsCustomerStaff customerStaff = staffService.selectIcsCustomerStaffById(userId);
             reservation.setUserName(customerStaff.getUsername());
+
+
         }
         return reservations;
     }
diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java
index 09966d5..aba17e9 100644
--- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java
+++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java
@@ -60,4 +60,6 @@ public interface IRoomEquipmentService extends IService<RoomEquipment> {
     int deleteRoomEquipmentById(Long id);
 
     RoomEquipment selectByEquipmentId(Long id);
+
+    RoomEquipment selectRoomId(Long roomId);
 }
diff --git a/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java b/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java
index e211f55..ecf7f64 100644
--- a/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java
+++ b/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java
@@ -10,8 +10,8 @@ import java.util.Map;
 
 public class SmallWxOkHttp {
 
-    static String APP_ID = "wxd9f93ef41a607dd5";
-    static String SECRET = "417507767334672bc46bb6eb3bf1c29b";
+    static String APP_ID = "wx5582a07c1fbbcf06";
+    static String SECRET = "ad24130a8919c613efd9538f69abafd3";
 
     public static JSONObject sendGet(String url , Map<String, String> map){
         OkHttpClient client = new OkHttpClient();
diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
index 2c5a2c2..6b2c3b3 100644
--- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
+++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
@@ -107,7 +107,7 @@ public class ApiEquipmentController extends BaseController {
      *  扫描二维码开门  用户id 和设备id
      */
     @RequiresPermissions("member:center:view")
-    @PostMapping("/scanOpenDoor")
+    @GetMapping("/scanOpenDoor")
     public R scanOpenDoor( RoomRecord roomRecord){
 
 //        long currentUserId = getCurrentUserId();
diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java
index 0a6f494..c71939e 100644
--- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java
+++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java
@@ -68,7 +68,7 @@ public class ApiRoomController extends BaseController {
     private IParkService parkService;
 
     @Autowired
-    private RoomEquipmentMapper roomEquipmentMapper;
+    private IRoomEquipmentService roomEquipmentService;
 
 
     /**
@@ -78,7 +78,13 @@ public class ApiRoomController extends BaseController {
     @PostMapping("list")
     public R list() {
         List<RoomContent> roomContents = roomContentService.selectApiRoomList(new RoomContent());
+        for (RoomContent roomContent : roomContents) {
+            RoomEquipment roomEquipment = roomEquipmentService.selectRoomId(roomContent.getRoomId());
+            if (null != roomEquipment){
+                roomContent.setEquipmentId(roomEquipment.getEquipmentId());
+            }
 
+        }
         return R.data(roomContents);
     }