%!s(int64=5) %!d(string=hai) anos · f3e35f6bb7
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 
				 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183205026.png?download=false)
			
 
				 
			
 
				 2.洗浴页提示
			
 
				-<<<<<<< HEAD
			
 
				 
			
 
				 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183340973.png?download=false)