qwer
asd
Merge branch 'master' of https://github.com/popotans/hjnassist

Conflicts:
	CodeGenerate/bin/Debug/Coder.exe
	CodeGenerate/bin/Debug/Coder.pdb
	CodeGenerate/bin/Debug/Helper.dll
	CodeGenerate/bin/Debug/Helper.pdb
	Helper/bin/Debug/Helper.dll
	Helper/bin/Debug/Helper.pdb
	TestConsole/Model/CommentsLog.cs
	TestConsole/bin/Debug/Helper.dll
	TestConsole/bin/Debug/Helper.pdb
	TestConsole/bin/Debug/TestConsole.exe
	TestConsole/bin/Debug/TestConsole.pdb
	TestProject1/bin/Debug/Helper.dll
	TestProject1/bin/Debug/Helper.pdb
	TestProject1/bin/Debug/TestProject1.dll
	TestProject1/bin/Debug/TestProject1.pdb
	WebApplication1/bin/Helper.dll
	WebApplication1/bin/Helper.pdb
	WebApplication1/bin/WebApplication1.dll
	WebApplication1/bin/WebApplication1.pdb
	WebApplication1/testDatabase/Dao.cs
	WebApplication1/testDatabaseMysql/Dao.cs