{"push_id":1183378647,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"4ec157c49a6be01cb3995ff8c7a833b319ea3253","before":"9c348905e6885f9f23be5eeeca2cf38718087c6d","commits":[{"sha":"903a1131e1f741db29d1df39cb927e4758a405ac","author":{"name":"klnstp7","email":"d048c3c96db5e69ad05eb93dfbda4dd9da156075@126.com"},"message":"增加原材料，购入品，设备，直接资质使用类别","distinct":true,"url":"https://api.github.com/repos/klnstp7/DCSTool/commits/903a1131e1f741db29d1df39cb927e4758a405ac"},{"sha":"4ec157c49a6be01cb3995ff8c7a833b319ea3253","author":{"name":"klnstp7","email":"d048c3c96db5e69ad05eb93dfbda4dd9da156075@126.com"},"message":"Merge remote-tracking branch 'DcsTool/master' into hyl/master\n\nConflicts:\n\tCY.DCSTool.Business/Algorithm/DcsRawMateAlgorithm.cs\n\tCY.DCSTool.Client/bin/Debug/CY.DCSTool.Client.exe\n\tCY.DCSTool.Client/bin/Debug/CY.DCSTool.Client.pdb\n\tCY.DCSTool.Client/bin/Debug/CY.DCSTool.Utility.dll\n\tCY.DCSTool.Client/bin/Debug/CY.DCSTool.Utility.pdb\n\tCY.DCSTool.Client/bin/Debug/Log/eventlog.log\n\tCY.DCSTool.Client/obj/x86/Debug/CY.DCSTool.Client.csproj.FileListAbsolute.txt\n\tCY.DCSTool.Client/obj/x86/Debug/CY.DCSTool.Client.csproj.GenerateResource.Cache\n\tCY.DCSTool.Client/obj/x86/Debug/CY.DCSTool.Client.csprojResolveAssemblyReference.cache\n\tCY.DCSTool.Client/obj/x86/Debug/CY.DCSTool.Client.exe\n\tCY.DCSTool.Client/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache\n\tCY.DCSTool.Model/bin/Debug/CY.DCSTool.Model.dll\n\tCY.DCSTool.Model/bin/Debug/CY.DCSTool.Model.pdb\n\tCY.DCSTool.Model/obj/Debug/CY.DCSTool.Model.dll\n\tCY.DCSTool.Model/obj/Debug/CY.DCSTool.Model.pdb\n\tCY.DCSTool.WCFClient/Service References/DCSToolBasicServiceReference/DCSToolBasicService.wsdl\n\tCY.DCSTool.WCFClient/Service References/DCSToolBasicServiceReference/DCSToolBasicService.xsd\n\tCY.DCSTool.WCFClient/Service References/DCSToolBasicServiceReference/DCSToolBasicService1.xsd\n\tCY.DCSTool.WCFClient/Service References/DCSToolBasicServiceReference/DCSToolBasicService4.xsd\n\tCY.DCSTool.WCFClient/Service References/DCSToolBasicServiceReference/Reference.cs","distinct":true,"url":"https://api.github.com/repos/klnstp7/DCSTool/commits/4ec157c49a6be01cb3995ff8c7a833b319ea3253"}]}
{"actor":{"display_login":"klnstp7"}}