保存代码
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/jyz/imagetaker/analysisImage/ImageCompose.java
保存代码