{"push_id":608081222,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"19a902a9b2237aee117c1ec82f7b9cd5febf0d7d","before":"777aca66393e5161186d4607d4de262f53772769","commits":[{"sha":"311e1a26d128ea7bd7ac0ecad30469ced38398df","author":{"email":"24854410c2ad28b91b2c9feec1426612434ecfb2@qq.com","name":"zhangchunlin"},"message":"解决冲突","distinct":true,"url":"https://api.github.com/repos/greatfly/GreatFly_Frame.T2.1/commits/311e1a26d128ea7bd7ac0ecad30469ced38398df"},{"sha":"19a902a9b2237aee117c1ec82f7b9cd5febf0d7d","author":{"email":"24854410c2ad28b91b2c9feec1426612434ecfb2@qq.com","name":"zhangchunlin"},"message":"Merge branch 'master' of https://github.com/greatfly/GreatFly_Frame.T2.1\n\nConflicts:\n\tTicketSettlement/Views/SaleTerminalSettlementVm.cs","distinct":true,"url":"https://api.github.com/repos/greatfly/GreatFly_Frame.T2.1/commits/19a902a9b2237aee117c1ec82f7b9cd5febf0d7d"}]}