fix: 合并冲突

spring

20 小时以前 4801ae5b97f6be8f5e414a41ee7c80ce5f9c9432

fix: 合并冲突

 multiple/config.json

@@ -341,7 +341,6 @@
    "logo": "logo/QLMCLogo.png",
    "favicon": "favicon/QLMCico.ico"
  },
<<<<<<< HEAD
  "HYZC": {
    "env": {
      "VITE_APP_TITLE": "山西华亿众成建材有限公司",
@@ -350,7 +349,7 @@
    },
    "logo": "logo/HYZCLogo.png",
    "favicon": "favicon/HYZCfavicon.ico"
=======
  },
  "OLD": {
    "env": {
      "VITE_APP_TITLE": "青海欧莱德新材料科技有限公司",
@@ -359,7 +358,6 @@
    },
    "logo": "logo/OLDLogo.png",
    "favicon": "favicon/OLD.ico"
>>>>>>> 2339ff7769b82ec68cc09ec70a9e61f70b0119dd
  },
  "logo": "/src/assets/logo/logo.png",
  "favicon": "/public/favicon.ico"