From 962cbf4c164ce08741c9bc41be979db25cc9851c Mon Sep 17 00:00:00 2001
From: hbk01 <3243430237@qq.com>
Date: Sat, 15 Oct 2022 09:47:44 +0800
Subject: [PATCH] =?UTF-8?q?+=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8D=E5=B0=84=E4=BB=AA=E5=8F=8A=E6=B0=94?=
 =?UTF-8?q?=E7=9B=B8=E8=89=B2=E8=B0=B1=E4=BB=AA=EF=BC=8C=E6=B6=B2=E7=9B=B8?=
 =?UTF-8?q?026=EF=BD=9E029=E4=BD=8D=E7=BD=AE=E5=8F=98=E6=9B=B4=E5=88=B0?=
 =?UTF-8?q?=E6=B6=B2=E7=9B=B8=E5=AE=A4=E4=BA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 equipment.info.js | 60 ++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/equipment.info.js b/equipment.info.js
index bdfc530..ea0ae48 100644
--- a/equipment.info.js
+++ b/equipment.info.js
@@ -168,30 +168,6 @@ let info = [
         "id": "CAA-14-025",
         "expir": "2023.07.01"
     },
-    {
-        "where": "液相室一",
-        "name": "液相色谱仪",
-        "id": "CAA-14-026",
-        "expir": "2024.07.24"
-    },
-    {
-        "where": "液相室一",
-        "name": "液相色谱仪",
-        "id": "CAA-14-027",
-        "expir": "2024.07.24"
-    },
-    {
-        "where": "液相室一",
-        "name": "液相色谱仪",
-        "id": "CAA-14-028",
-        "expir": "2024.07.24"
-    },
-    {
-        "where": "液相室一",
-        "name": "液相色谱仪",
-        "id": "CAA-14-029",
-        "expir": "2024.07.24"
-    },
     {
         "where": "液相室一",
         "name": "液相色谱仪",
@@ -218,6 +194,30 @@ let info = [
     },
 
     // 液相室二
+    {
+        "where": "液相室二",
+        "name": "液相色谱仪",
+        "id": "CAA-14-026",
+        "expir": "2024.07.24"
+    },
+    {
+        "where": "液相室二",
+        "name": "液相色谱仪",
+        "id": "CAA-14-027",
+        "expir": "2024.07.24"
+    },
+    {
+        "where": "液相室二",
+        "name": "液相色谱仪",
+        "id": "CAA-14-028",
+        "expir": "2024.07.24"
+    },
+    {
+        "where": "液相室二",
+        "name": "液相色谱仪",
+        "id": "CAA-14-029",
+        "expir": "2024.07.24"
+    },
     {
         "where": "液相室二",
         "name": "液相色谱仪",
@@ -292,6 +292,12 @@ let info = [
         "id": "CAB-14-011",
         "expir": "2023.12.01"
     },
+    {
+        "where": "气相室",
+        "name": "气相色谱仪",
+        "id": "CAB-14-012",
+        "expir": "2024.09.22"
+    },
 
     // 综合仪器室二
     {
@@ -348,6 +354,12 @@ let info = [
         "id": "CAP-14-002",
         "expir": "2023.06.13"
     },
+    {
+        "where": "仪器室二",
+        "name": "衍射仪",
+        "id": "XRD-14-001",
+        "expir": "2024.07.31"
+    },
 
     // 综合仪器室三
     {