Merge branch 'TangShanKaiPing' of http://49.4.92.112:3000/root/ZHXY into TangShanKaiPing

Former-commit-id: cb63c84b109eb9c2753b646318efb8a2312fa54c
5 years ago · c583d637b8
parent 238e504b9a 4dc7e6dc56
commit c583d637b8
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 .vs
 .svn
-~$*.xlsx
+~$*.xlsx
 /projects/Mobile
--- a/projects/WebSPA/wwwroot/Readme-TangShanKaiPing.md
+++ b/projects/WebSPA/wwwroot/Readme-TangShanKaiPing.md
@ -0,0 +1 @@
 唐山开平项目