Home Explore Help
Register Sign In
ch-校园卡
/
waterElectricityMinApp
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

程志平 5 years ago
parent
717d521f3a 2272e9781e
commit
4ca355cd7b
1 changed files with 1 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      README.md

+ 1 - 0
README.md
View File 

@@ -5,6 +5,7 @@
 
 ![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)