Merge branch 'master' of https://inno.sh-sict.com/gitlab/miaojiale/screenforshow

30c5ac85 · miaojiale · df7c5e83 · 46d2a21e · 30c5ac85
Commit 30c5ac85 authored Sep 26, 2023 by miaojiale
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

README.md README.md +4 -0

No files found.
--- a/README.md
+++ b/README.md
+<<<<<<< HEAD
 # 温州重大疾病筛查 
 # vue-gicc2.0 wzCritical分支

@@ -35,3 +36,6 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 3、emplate中的组件 统一使用 kebab-case
 4、组件的引入名 统一使用 CamelCase  
 ```
+=======
+1
+>>>>>>> 46d2a21e1a4d318978f38f142571c8408db16dfc