{"push_id":2572938709,"size":50,"distinct_size":1,"ref":"refs/heads/shl_1","head":"cc1684785b095f49555cf4290755b950c7292366","before":"f4e7aed1508a0dc1c48cbcec8175deb80bf99def","commits":[{"sha":"9433f8f7360fec8f07a8ca611aaf5c9e1bb785cd","author":{"name":"Perdon","email":"d521627d52bc2f3c17fead0909cb1c283141999c@gmail.com"},"message":"update","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/9433f8f7360fec8f07a8ca611aaf5c9e1bb785cd"},{"sha":"5ce774081c1203912180e20a1f1f7fd5db2be645","author":{"name":"Perdon","email":"d521627d52bc2f3c17fead0909cb1c283141999c@gmail.com"},"message":"update","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/5ce774081c1203912180e20a1f1f7fd5db2be645"},{"sha":"e386bf8f6c12a5fdd8c7dcc467909143b2dba607","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"区分预定非预定是否对房间数做出修改","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/e386bf8f6c12a5fdd8c7dcc467909143b2dba607"},{"sha":"da8e1c48dc1eba36bf4a9c8338a8cf0e84342c1b","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"增加无空房判断","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/da8e1c48dc1eba36bf4a9c8338a8cf0e84342c1b"},{"sha":"f973d47206f40877468bfebfab080e596c67f67c","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"Merge branch 'master' into ryx","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/f973d47206f40877468bfebfab080e596c67f67c"},{"sha":"edc285e5cb03ee1ddee6fe99dfa45e8ef097dc23","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"merge","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/edc285e5cb03ee1ddee6fe99dfa45e8ef097dc23"},{"sha":"ec81b400a0af9daa0c343d8df9a61a01d1121851","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"0515","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/ec81b400a0af9daa0c343d8df9a61a01d1121851"},{"sha":"55a844d577ae48cf3e3868f0dae3e5c7347bd0d7","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"checkinfo加了三个属性","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/55a844d577ae48cf3e3868f0dae3e5c7347bd0d7"},{"sha":"d6aa4f726a71c35fb4ee99ca15d50b0a2cfb26ad","author":{"name":"Huiling So","email":"e132cb55050451cb63c90c43451aaefff53a3ada@qq.com"},"message":"Merge pull request #33 from HotelMers/shl_1\n\n 修改了room的数据库以及相应操作（测试前先按重置客房按钮清空一下旧数据库）","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/d6aa4f726a71c35fb4ee99ca15d50b0a2cfb26ad"},{"sha":"225244bb58b80b5dbdc065f7ced6b75be1a8bc56","author":{"name":"luomiao","email":"fec4059df62ce367c69639007f734633c97a1d06@qq.com"},"message":"完善balanceclear\n\n完善balanceclear","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/225244bb58b80b5dbdc065f7ced6b75be1a8bc56"},{"sha":"b98b2673198a7bb947be15fc573c1255e335e6cb","author":{"name":"luomiao","email":"fec4059df62ce367c69639007f734633c97a1d06@qq.com"},"message":"Merge branch 'luomiao_1'","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/b98b2673198a7bb947be15fc573c1255e335e6cb"},{"sha":"f55113231ea4860ea5d780e61c91414081d6b765","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"功能基本完成，待测试","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/f55113231ea4860ea5d780e61c91414081d6b765"},{"sha":"2fc8f9e4f02667cda335074ec4883b6002f3df28","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"FIX conflicts","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/2fc8f9e4f02667cda335074ec4883b6002f3df28"},{"sha":"0d55b68f31e37dc31b16bda97c6c3878e827415e","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"修改","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/0d55b68f31e37dc31b16bda97c6c3878e827415e"},{"sha":"2bab0e03da4ef018f0231599a652d68c7167596e","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"fix conflicts","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/2bab0e03da4ef018f0231599a652d68c7167596e"},{"sha":"48d489d3398b4a508bc0b3e181c9da5755e0a505","author":{"name":"rainCreek","email":"ed25f2ebf0a29611a09749ba8c63c2ed4e074417@qq.com"},"message":"Merge branch 'master' into ryx","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/48d489d3398b4a508bc0b3e181c9da5755e0a505"},{"sha":"7a81a5fba35d1026d7d64b535d31ef945fff0aa4","author":{"name":"Perdon","email":"d521627d52bc2f3c17fead0909cb1c283141999c@gmail.com"},"message":"Merge branch 'ryx' of https://github.com/HotelMers/HotelM into Charles\n\n* 'ryx' of https://github.com/HotelMers/HotelM: (183 commits)\n  fix conflicts\n  修改\n  FIX conflicts\n  功能基本完成，待测试\n  完善balanceclear\n  修改了room的数据库以及相应操作（测试前先按重置客房按钮清空一下旧数据库）\n  Update rooms.js\n  去掉房间价格\n  解决冲突\n  Update manageroom.js\n  改成room.js的错误&增加易用性\n  统一查询会员页面\n  index修复\n  Update checkout.ejs\n  1\n  恢复之前版本（应该是有人误删了）\n  增加会员查找按钮\n  解决重置客房冲突\n  checkinfo加了三个属性\n  0515\n  ...\n\n# Conflicts:\n#\tlogs/success.log","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/7a81a5fba35d1026d7d64b535d31ef945fff0aa4"},{"sha":"1982851e6eb9a0225f719dcf797205614783c8a7","author":{"name":"Cassie1213","email":"2f5bf778eddaedd280047f7f95e82fdf3cfb14d3@users.noreply.github.com"},"message":"增加了两个数据库操作\n\n分别是获取所有入住信息和通过起止时间获取入住信息","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/1982851e6eb9a0225f719dcf797205614783c8a7"},{"sha":"c5f57ac517e8f8d88c143eaae1f7baab0a151460","author":{"name":"YUKE LI","email":"f2d3354cc46b154e4289fa97a1892d7095c2843b@YUKEdeMBP.lan"},"message":"Merge branch 'master' into lyk","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/c5f57ac517e8f8d88c143eaae1f7baab0a151460"},{"sha":"bc9969814e441b85550000d4ddd1bedce7248c2e","author":{"name":"Perdon","email":"d521627d52bc2f3c17fead0909cb1c283141999c@gmail.com"},"message":"update signin and signup functions","distinct":false,"url":"https://api.github.com/repos/HotelMers/HotelM/commits/bc9969814e441b85550000d4ddd1bedce7248c2e"}]}
{"actor":{"display_login":"WeilingSo"}}