1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service.git
2014 4 24 hyx冲突
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.TransManage/OPCApp.TransManage.csproj
	OPCApp/OPCApp.TransManage/Print/PrintInvoice.rdlc
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
zxy
zxy
zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp_Main/App.config
zxy
Merge branch 'master' into vopc
zxy
zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
11
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
fix bug
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service.git
add upload