Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # package.json
2 months ago · 4d72e7493d
parent 4ce05b1fdd 5738b643aa
commit 4d72e7493d
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package",
-  "name": "hwBm",
+  "name": "BHMS",
  "version": "5.5.0-2.5.0",
  "description": "海威经营管理信息化系统",
  "author": "LionLi",