Commit Graph

4 Commits (5bb1815df088a0889aa1762bfcafd2834968de5f)

Author SHA1 Message Date
hanxuntao d013f7c848 Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
# Conflicts:
#	.gitignore
#	BookingJieFeng/obj/Debug/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csprojAssemblyReference.cache
#	BookingWeb/BookingWeb.csproj.user
#	BookingWeb/obj/Debug/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	BookingWeb/obj/Release/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Release/BookingWeb.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csprojAssemblyReference.cache
#	DSWeb.Common/bin/Debug/DSWeb.Common.dll
#	DSWeb.Common/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Common/bin/Release/DSWeb.Common.dll
#	DSWeb.Common/bin/Release/DSWeb.Common.pdb
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
#	DSWeb.Common/obj/Debug/DSWeb.Common.dll
#	DSWeb.Common/obj/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Common.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
#	DSWeb.Interface/bin/Debug/HcDBUtility.dll
#	DSWeb.Interface/bin/Debug/HcDBUtility.pdb
#	DSWeb.Interface/bin/Release/DSWeb.Common.dll
#	DSWeb.Interface/bin/Release/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Release/HcDBUtility.dll
#	DSWeb.Interface/bin/Release/HcDBUtility.pdb
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csprojAssemblyReference.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
#	DSWeb/UploadFiles/SysUser_Sign/1BEC90E1-9780-472F-90C2-0C6390C044A4.jpg
#	DSWeb/Web.config
#	DSWeb/bin/DSWeb.Common.dll
#	DSWeb/bin/DSWeb.Common.pdb
#	DSWeb/bin/DSWeb.Interface.dll
#	DSWeb/bin/DSWeb.Interface.pdb
#	DSWeb/bin/DSWeb.XmlSerializers.dll
#	DSWeb/bin/DSWeb.dll
#	DSWeb/bin/DSWeb.dll.config
#	DSWeb/bin/DSWeb.pdb
#	DSWeb/bin/DSWebComponent.dll
#	DSWeb/bin/DSWebComponent.pdb
#	DSWeb/bin/FrmHttpHelper.dll
#	DSWeb/bin/FrmHttpHelper.pdb
#	DSWeb/bin/HcDBUtility.dll
#	DSWeb/bin/HcDBUtility.pdb
#	DSWeb/bin/JsonHelper.dll
#	DSWeb/bin/JsonHelper.pdb
#	DSWeb/bin/OfficeHelper.dll
#	DSWeb/bin/OfficeHelper.pdb
#	DSWeb/bin/SocialExplorer.FastDBF.dll
#	DSWeb/bin/SocialExplorer.FastDBF.pdb
#	DSWeb/bin/WebSqlHelper.dll
#	DSWeb/bin/WebSqlHelper.pdb
#	DispatchWeb/obj/Debug/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csprojAssemblyReference.cache
#	HcDBUtility/bin/Debug/HcDBUtility.dll
#	HcDBUtility/bin/Debug/HcDBUtility.pdb
#	HcDBUtility/bin/Release/HcDBUtility.dll
#	HcDBUtility/bin/Release/HcDBUtility.pdb
#	JobAutoCreateFee/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csprojAssemblyReference.cache
#	JobPingTaiWork/obj/Debug/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Debug/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csprojAssemblyReference.cache
#	JobScheduler/JobScheduler.csproj
#	JobScheduler/obj/Debug/JobScheduler.csproj.CoreCompileInputs.cache
#	JobScheduler/obj/Release/JobScheduler.csproj.CoreCompileInputs.cache
#	JobSendAgentMail/obj/Debug/JobSendAgentMail.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Debug/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csprojAssemblyReference.cache
#	Job_BoschEdi_FTP/obj/Debug/Job_BoschEdi_FTP.csproj.CoreCompileInputs.cache
#	Job_BoschEdi_FTP/obj/Release/Job_BoschEdi_FTP.csprojAssemblyReference.cache
#	Job_DSWMS_REPORT/obj/Debug/Job_DSWMS_REPORT.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Debug/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csprojAssemblyReference.cache
#	JsonHelper/obj/Debug/JsonHelper.csproj.CoreCompileInputs.cache
#	JsonHelper/obj/Release/JsonHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Debug/OfficeHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Release/OfficeHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Debug/WebSqlHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Release/WebSqlHelper.csproj.CoreCompileInputs.cache
2 years ago
ddlucky 7a489c2e89 '' 2 years ago
ddlucky 14e6227ce6 '自动生成舱单费,分单功能' 3 years ago
ddlucky a51c24da13 'first' 3 years ago