{"push_id":1443034758,"size":5,"distinct_size":1,"ref":"refs/heads/Gy","head":"2918b55ecd6c3c1de68027c6be83cbe9cb4f752c","before":"95eeb031f36988728584b21bf1ed1d0cc98390d5","commits":[{"sha":"beb67bfceeeffb4f38bcaf9d6470d99c16b02363","author":{"name":"CharlesFeng","email":"d3ea73883db5bf74f3cb9ccf0b1df0de6ee1f7fb@126.com"},"message":"Merge branch 'master' into Charles","distinct":false,"url":"https://api.github.com/repos/NJUASI/InternetHotelReservationSystem/commits/beb67bfceeeffb4f38bcaf9d6470d99c16b02363"},{"sha":"9d14a137e5fa0d36997284c0c6b8e8f5295a11fb","author":{"name":"CharlesFeng","email":"d3ea73883db5bf74f3cb9ccf0b1df0de6ee1f7fb@126.com"},"message":"网站营销人员的order界面","distinct":false,"url":"https://api.github.com/repos/NJUASI/InternetHotelReservationSystem/commits/9d14a137e5fa0d36997284c0c6b8e8f5295a11fb"},{"sha":"83c44012f79413c5907722162a997e499aef2f3a","author":{"name":"CharlesFeng","email":"d3ea73883db5bf74f3cb9ccf0b1df0de6ee1f7fb@126.com"},"message":"Merge branch 'master' into Charles\n\n# Conflicts:\n#\nClientSystem/target/surefire-reports/TEST-businessLogic.hotelBL.HotelTes\nt.xml\n#\nClientSystem/target/surefire-reports/TEST-businessLogic.marketBL.driver.\nMarketDataService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-businessLogic.memberBL.MemberT\nest.xml\n#\nClientSystem/target/surefire-reports/TEST-businessLogic.userBL.UserTest.\nxml\n#\nClientSystem/target/surefire-reports/TEST-presentation.guestUI.driver.Ho\ntelBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.guestUI.driver.Lo\ngInBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.guestUI.driver.Me\nmberBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.guestUI.driver.Or\nderBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.guestUI.driver.Us\nerBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.hotelWorkerUI.dri\nver.HotelBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.hotelWorkerUI.dri\nver.LogInBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.hotelWorkerUI.dri\nver.OrderBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.hotelWorkerUI.dri\nver.PromotionBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.signUpUI.driver.L\nogInBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webManagerUI.driv\ner.LogInBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webManagerUI.driv\ner.UserBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webMarketerUI.dri\nver.LogInBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webMarketerUI.dri\nver.MarketBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webMarketerUI.dri\nver.OrderBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/TEST-presentation.webMarketerUI.dri\nver.PromotionBLService_DriverTest.xml\n#\nClientSystem/target/surefire-reports/businessLogic.hotelBL.HotelTest.txt\n#\nClientSystem/target/surefire-reports/businessLogic.marketBL.driver.Marke\ntDataService_DriverTest.txt\n#\nClientSystem/target/surefire-reports/businessLogic.memberBL.MemberTest.t\nxt\n#\tClientSystem/target/surefire-reports/businessLogic.userBL.UserTest.txt\n#\nClientSystem/target/surefire-reports/presentation.guestUI.driver.HotelBL\nService_DriverTest.txt\n#\nClientSystem/target/surefire-reports/presentation.guestUI.driver.OrderBL\nService_DriverTest.txt\n#\nClientSystem/target/surefire-reports/presentation.guestUI.driver.UserBLS\nervice_DriverTest.txt\n#\nClientSystem/target/surefire-reports/presentation.hotelWorkerUI.driver.O\nrderBLService_DriverTest.txt\n#\tCommonHub/target/CommonHub-0.0.1-SNAPSHOT.jar\n#\tServerSystem/target/ServerSystem-0.0.1-SNAPSHOT.jar\n#\nServerSystem/target/surefire-reports/TEST-dataServiceImpl.GuestDataServi\nceImpl_Test.xml\n#\nServerSystem/target/surefire-reports/TEST-dataServiceImpl.HotelWorkerDat\naServiceImpl_Test.xml\n#\nServerSystem/target/surefire-reports/TEST-dataServiceImpl.MarketDataServ\niceImpl_Test.xml\n#\nServerSystem/target/surefire-reports/TEST-dataServiceImpl.WebManagerData\nServiceImpl_Test.xml\n#\nServerSystem/target/surefire-reports/TEST-dataServiceImpl.WebMarekterDat\naServiceImpl_Test.xml\n#\nServerSystem/target/surefire-reports/dataServiceImpl.GuestDataServiceImp\nl_Test.txt\n#\nServerSystem/target/surefire-reports/dataServiceImpl.HotelWorkerDataServ\niceImpl_Test.txt\n#\nServerSystem/target/surefire-reports/dataServiceImpl.MarketDataServiceIm\npl_Test.txt\n#\nServerSystem/target/surefire-reports/dataServiceImpl.WebManagerDataServi\nceImpl_Test.txt\n#\nServerSystem/target/surefire-reports/dataServiceImpl.WebMarekterDataServ\niceImpl_Test.txt","distinct":false,"url":"https://api.github.com/repos/NJUASI/InternetHotelReservationSystem/commits/83c44012f79413c5907722162a997e499aef2f3a"},{"sha":"d0fcaa12f981fed314076488cb6a5cc43b4df8b3","author":{"name":"CharlesFeng","email":"d3ea73883db5bf74f3cb9ccf0b1df0de6ee1f7fb@126.com"},"message":"Merge pull request #36 from NJUASI/Charles\n\n酒店工作人员的order界面","distinct":false,"url":"https://api.github.com/repos/NJUASI/InternetHotelReservationSystem/commits/d0fcaa12f981fed314076488cb6a5cc43b4df8b3"},{"sha":"2918b55ecd6c3c1de68027c6be83cbe9cb4f752c","author":{"name":"GY15","email":"34c6dbece09bcbeeb686a3785b24765c9155a601@qq.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Gy\n\n# Conflicts:\n\n#\tClientSystem/target/classes/presentation/hotelWorkerUI/controller/OrderController.class","distinct":true,"url":"https://api.github.com/repos/NJUASI/InternetHotelReservationSystem/commits/2918b55ecd6c3c1de68027c6be83cbe9cb4f752c"}]}
{"actor":{"display_login":"GY15"}}