Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/ldt into dev

 Conflicts:

	ldt-core/src/main/resources/application-test.yml