{"push_id":1444578662,"size":11,"distinct_size":1,"ref":"refs/heads/xiamutian","head":"b3d9ae2953d26e2be3853f6f4d10aab026500acc","before":"5f50b365b0359afa5ab2e96ed3390d32c9d0c520","commits":[{"sha":"289dff336db522741aaaaba00e859af4bf7939bc","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"Merge branch 'master' into wuxiufeng","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/289dff336db522741aaaaba00e859af4bf7939bc"},{"sha":"998d9344476e148b1f41054773a8d0ec8b145050","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"Merge branch 'master' into wxf2","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/998d9344476e148b1f41054773a8d0ec8b145050"},{"sha":"2c6b3fe7a7bed578a242a1e0c88d45ed423eb47d","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"update from master","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/2c6b3fe7a7bed578a242a1e0c88d45ed423eb47d"},{"sha":"f569e9bc455ecb85ef026760460f1a048aabd0fc","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"修改","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/f569e9bc455ecb85ef026760460f1a048aabd0fc"},{"sha":"30b9afe50aa20f0b2a8b1c67d4426446808fb159","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"orderdatamock的修改","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/30b9afe50aa20f0b2a8b1c67d4426446808fb159"},{"sha":"3d07ad3086cb53c16fba086741bde5f1289876a6","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"Merge branch 'master' into wxf2\n\nConflicts:\n\n\tHotelBookingServer/src/main/java/po/promotionpo/hotelpromotionPO/BirthdayHotelproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/hotelpromotionPO/EnterpriseHotelproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/hotelpromotionPO/LargeAmountHotelproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/hotelpromotionPO/PeriodHotelproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/webpromotionPO/CircleWebproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/webpromotionPO/PeriodWebproPO.java\n\n\tHotelBookingServer/src/main/java/po/promotionpo/webpromotionPO/VipLevelWebproPO.java","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/3d07ad3086cb53c16fba086741bde5f1289876a6"},{"sha":"e8fdb8ff6e482dd331939b6e17dbc6bffe76d30f","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"Merge branch 'master' into wxf2","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/e8fdb8ff6e482dd331939b6e17dbc6bffe76d30f"},{"sha":"ec0b9e9e922ff152ad617d2f96070079c6437f2c","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"orderdatamock修改","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/ec0b9e9e922ff152ad617d2f96070079c6437f2c"},{"sha":"97934592246c6eec8df6f207fc09ee28e370a318","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"修改orderdatamock与userdatamock","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/97934592246c6eec8df6f207fc09ee28e370a318"},{"sha":"8b5f59e895da3d68190d43aabc9984bdd1ae2616","author":{"name":"wuxiufeng","email":"f03ef234c9bea753db013ebb41e8585803c53a9e@qq.com"},"message":"Merge pull request #16 from xiekailian/wxf2\n\nWxf2","distinct":false,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/8b5f59e895da3d68190d43aabc9984bdd1ae2616"},{"sha":"b3d9ae2953d26e2be3853f6f4d10aab026500acc","author":{"name":"Flamexmt","email":"e9a2def0d68de9e4d362fc9c05a87eb6b9f58649@qq.com"},"message":"Merge branch 'master' into xiamutian","distinct":true,"url":"https://api.github.com/repos/xiekailian/HotelServer/commits/b3d9ae2953d26e2be3853f6f4d10aab026500acc"}]}
{"actor":{"display_login":"Flamexmt"}}