{"push_id":1474990999,"size":3,"distinct_size":3,"ref":"refs/heads/dev","head":"905628ef09b9c4ae1b8a276f5cf96c01f99a0fe3","before":"b9e05b3865c4eba4ae14bde5112e988130c2833a","commits":[{"sha":"7e538403e47b540f72e50d71cbea547e4f76e741","author":{"name":"haishangqishi","email":"5fb6024a7092181e6dc876ab03c57e685e51f47f@163.com"},"message":".","distinct":true,"url":"https://api.github.com/repos/haishangqishi/webcreo/commits/7e538403e47b540f72e50d71cbea547e4f76e741"},{"sha":"530909d0429dbd0fb65fe2839d76459c1267867d","author":{"name":"haishangqishi","email":"5fb6024a7092181e6dc876ab03c57e685e51f47f@163.com"},"message":".","distinct":true,"url":"https://api.github.com/repos/haishangqishi/webcreo/commits/530909d0429dbd0fb65fe2839d76459c1267867d"},{"sha":"905628ef09b9c4ae1b8a276f5cf96c01f99a0fe3","author":{"name":"haishangqishi","email":"5fb6024a7092181e6dc876ab03c57e685e51f47f@163.com"},"message":"Merge branch 'dev' of github.com:haishangqishi/webcreo into dev\n\n# Conflicts:\n#\tBLL/bin/Debug/BLL.dll\n#\tBLL/bin/Debug/BLL.pdb\n#\tBLL/bin/Debug/DALFactory.dll\n#\tBLL/bin/Debug/DALFactory.pdb\n#\tBLL/bin/Debug/IDAL.dll\n#\tBLL/bin/Debug/IDAL.pdb\n#\tBLL/bin/Debug/Model.dll\n#\tBLL/bin/Debug/Model.pdb\n#\tBLL/obj/Debug/BLL.csproj.FileListAbsolute.txt\n#\tBLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache\n#\tBLL/obj/Debug/BLL.dll\n#\tBLL/obj/Debug/BLL.pdb\n#\tBLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tCommon/Pager.cs\n#\tCommon/bin/Debug/Common.dll\n#\tCommon/bin/Debug/Common.pdb\n#\tCommon/obj/Debug/Common.csproj.FileListAbsolute.txt\n#\tCommon/obj/Debug/Common.dll\n#\tCommon/obj/Debug/Common.pdb\n#\tCommon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tCreoPro.suo\n#\tCreoPro/Controllers/mainFormController.cs\n#\tCreoPro/CreoPro.csproj\n#\tCreoPro/Scripts/paraInput.js\n#\tCreoPro/Views/mainForm/paraInput.cshtml\n#\tCreoPro/Views/mainForm/top.cshtml\n#\tCreoPro/bin/BLL.dll\n#\tCreoPro/bin/BLL.pdb\n#\tCreoPro/bin/Common.dll\n#\tCreoPro/bin/Common.pdb\n#\tCreoPro/bin/CreoPro.dll\n#\tCreoPro/bin/CreoPro.pdb\n#\tCreoPro/bin/DALFactory.dll\n#\tCreoPro/bin/DALFactory.pdb\n#\tCreoPro/bin/DBUtility.dll\n#\tCreoPro/bin/DBUtility.pdb\n#\tCreoPro/bin/IDAL.dll\n#\tCreoPro/bin/IDAL.pdb\n#\tCreoPro/bin/Model.dll\n#\tCreoPro/bin/Model.pdb\n#\tCreoPro/bin/SqlServerDAL.dll\n#\tCreoPro/bin/SqlServerDAL.pdb\n#\tCreoPro/obj/Debug/CreoPro.csproj.FileListAbsolute.txt\n#\tCreoPro/obj/Debug/CreoPro.csproj.ResolveComReference.cache\n#\tCreoPro/obj/Debug/CreoPro.csprojResolveAssemblyReference.cache\n#\tCreoPro/obj/Debug/CreoPro.dll\n#\tCreoPro/obj/Debug/CreoPro.pdb\n#\tCreoPro/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tCreoPro/obj/Debug/Interop.pfcls.dll\n#\tDALFactory/bin/Debug/DALFactory.dll\n#\tDALFactory/bin/Debug/DALFactory.pdb\n#\tDALFactory/bin/Debug/IDAL.dll\n#\tDALFactory/bin/Debug/IDAL.pdb\n#\tDALFactory/bin/Debug/Model.dll\n#\tDALFactory/bin/Debug/Model.pdb\n#\tDALFactory/obj/Debug/DALFactory.csproj.FileListAbsolute.txt\n#\tDALFactory/obj/Debug/DALFactory.csprojResolveAssemblyReference.cache\n#\tDALFactory/obj/Debug/DALFactory.dll\n#\tDALFactory/obj/Debug/DALFactory.pdb\n#\tDALFactory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tDBUtility/bin/Debug/DBUtility.dll\n#\tDBUtility/bin/Debug/DBUtility.pdb\n#\tDBUtility/obj/Debug/DBUtility.csproj.FileListAbsolute.txt\n#\tDBUtility/obj/Debug/DBUtility.dll\n#\tDBUtility/obj/Debug/DBUtility.pdb\n#\tDBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tIDAL/bin/Debug/IDAL.dll\n#\tIDAL/bin/Debug/IDAL.pdb\n#\tIDAL/bin/Debug/Model.dll\n#\tIDAL/bin/Debug/Model.pdb\n#\tIDAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tIDAL/obj/Debug/IDAL.csproj.FileListAbsolute.txt\n#\tIDAL/obj/Debug/IDAL.csprojResolveAssemblyReference.cache\n#\tIDAL/obj/Debug/IDAL.dll\n#\tIDAL/obj/Debug/IDAL.pdb\n#\tModel/bin/Debug/Model.dll\n#\tModel/bin/Debug/Model.pdb\n#\tModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tModel/obj/Debug/Model.csproj.FileListAbsolute.txt\n#\tModel/obj/Debug/Model.dll\n#\tModel/obj/Debug/Model.pdb\n#\tSqlServerDAL/bin/Debug/DBUtility.dll\n#\tSqlServerDAL/bin/Debug/DBUtility.pdb\n#\tSqlServerDAL/bin/Debug/IDAL.dll\n#\tSqlServerDAL/bin/Debug/IDAL.pdb\n#\tSqlServerDAL/bin/Debug/Model.dll\n#\tSqlServerDAL/bin/Debug/Model.pdb\n#\tSqlServerDAL/bin/Debug/SqlServerDAL.dll\n#\tSqlServerDAL/bin/Debug/SqlServerDAL.pdb\n#\tSqlServerDAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n#\tSqlServerDAL/obj/Debug/SqlServerDAL.csproj.FileListAbsolute.txt\n#\tSqlServerDAL/obj/Debug/SqlServerDAL.csprojResolveAssemblyReference.cache\n#\tSqlServerDAL/obj/Debug/SqlServerDAL.dll\n#\tSqlServerDAL/obj/Debug/SqlServerDAL.pdb","distinct":true,"url":"https://api.github.com/repos/haishangqishi/webcreo/commits/905628ef09b9c4ae1b8a276f5cf96c01f99a0fe3"}]}
{"actor":{"display_login":"haishangqishi"}}