Initial commit
created
优化了log展示方式
nothing
Merge branch 'master' of github.com:lokicui/salary_cal_v2

Conflicts:
	.gitignore
	LICENSE
	README.md