Merge branch 'dev' into test

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

@@ -138,7 +138,7 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper, SRoom> implements
                             packs.add(pack);
                         }
                     });
-                    sRoom.setPackList(packList);
+                    vo.setPackList(packs);
                 }
                 voList.add(vo);
             });