Merge branch 'master' of http://code.diaosaas.com/Whispa/afrishop-refactored-project

0b6bcdff · wudepeng · 96914616 · 20931e2b · 0b6bcdff
--- a/src/test/java/com/example/afrishop_v3/aa.txt
+++ b/src/test/java/com/example/afrishop_v3/aa.txt
-helloworld！
\ No newline at end of file
+helloworld！
+hhahah
+heel来了
\ No newline at end of file