Merge branch 'master' of http://git.fmode.cn:3000/0225103/App-CampusHelp

READER.md

@@ -258,4 +258,8 @@
 
 - 我的页面对标
 
+<<<<<<< HEAD
+=======
+<!-- ![img,我的](/image/我的.jpg)  -->
+>>>>>>> fc9ba9b47807465600204b086c963ec75e08b753
 <img src="image\我的.jpg" width=25%>