Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/vo/SRoomVo.java

@@ -119,6 +119,11 @@ public class SRoomVo extends BaseEntity
     private Long recordsId;
 
     /**
+     * 保洁人员id
+     */
+    private Long recordsUserId;
+
+    /**
      * 是否脏房
      */
     private Integer isDirtyRoom;

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -404,6 +404,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
                             SCleanRecords records = recordsMap.get(room.getId()).get(0);
                             room.setRecordsStatus(records.getStatus());
                             room.setRecordsId(records.getId());
+                            room.setRecordsUserId(records.getConsumerId());
                         }
 
                     }