fix bug
add date
Merge branch 'master' of E:\dev_code\php\ave_1000 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml