Browse Source

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

程志平 5 years ago
parent
commit
7cfcd44129
1 changed files with 0 additions and 1 deletions
  1. 0 1
      README.md

+ 0 - 1
README.md

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