Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/waterElectricityMinApp

# Conflicts:
#	README.md

README.md

@@ -1,14 +1,14 @@
 # waterElectricityMinApp
 
-1. 首页
+1.首页
 
 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183205026.png?download=false)
 
-2. 洗浴页提示
+2.洗浴页提示
 
+<<<<<<< HEAD
 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183340973.png?download=false)
 
-3. 洗浴页
+3.洗浴页
 
 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183419695.png?download=false)
-