modify pic view logical
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	logs/server.log
t Please enter the commit message for your changes. Lines starting
update date