ss
s
s
Merge branch 'master' of https://github.com/fangjh/BillingSystem

Conflicts:
	BillingSystem/BillingSystem.csproj
	BillingSystem/DAL/FirstLoadDAL.cs
	FBJHelper/bin/Debug/BillingSystem.dll
	FBJHelper/bin/Debug/BillingSystem.pdb
	FBJHelper/bin/Debug/FBJHelper.dll
	FBJHelper/bin/Debug/FBJHelper.pdb
	MyControl/bin/Debug/MyControl.dll
	MyControl/bin/Debug/MyControl.pdb
fix project file