settings

Change-Id: Ic68917f0b4528a8c6d998bd0ccf1f8d1d56e77ff
Signed-off-by: liuxy <291462491@qq.com>
Merge branch 'develop' of git@github.com:qq291462491/dd_note.git into
develop

Conflicts:
	note-parent/.settings/org.eclipse.core.resources.prefs
	note-root/.settings/org.eclipse.core.resources.prefs