Merge branch 'master' of http://124.71.134.146:3000/xiaotan/ba-base

# Conflicts: # .gitignore # README.md
1 year ago · 07a3bbdd34
parent 3a10e8ca53 8eb003e095
commit 07a3bbdd34
2 changed files with 5 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+
 .DS_Store
 node_modules/
 dist/
@ -26,3 +27,4 @@ target/
 **/out/
 package-lock.json
 yarn.lock
+
--- a/README.md
+++ b/README.md
@ -1,3 +1,4 @@
-# bs-jxc

-保税进销存
+# ba-base
+
+基础框架