fix

package-lock.json

@@ -2701,8 +2701,7 @@
         "commander": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-            "dev": true
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
         },
         "commondir": {
             "version": "1.0.1",
@@ -7169,6 +7168,7 @@
             "requires": {
                 "filesaver.js": "^0.2.0",
                 "xlsx-style": "^0.8.13"
+<<<<<<< Updated upstream
             },
             "dependencies": {
                 "adler-32": {
@@ -7230,6 +7230,8 @@
                         "ssf": "~0.8.1"
                     }
                 }
+=======
+>>>>>>> Stashed changes
             }
         },
         "tailwindcss": {
@@ -7602,7 +7604,10 @@
             "integrity": "sha512-Q+HPjuY98R0fLQ45eOOCYeMY7vpjU1H/Qqs0ptdBI6xe3nDDsPE4r/kN5YA9rVxQFP/PKhG5qQR4rqy02xPabw=="
         },
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 =======
+=======
+>>>>>>> Stashed changes
         "vue-excel-xlsx": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/vue-excel-xlsx/-/vue-excel-xlsx-1.2.2.tgz",
@@ -7611,6 +7616,9 @@
                 "xlsx": "^0.14.4"
             }
         },
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
         "vue-flatpickr-component": {
             "version": "8.1.7",
@@ -8147,6 +8155,55 @@
                 }
             }
         },
+<<<<<<< Updated upstream
+=======
+        "xlsx-style": {
+            "version": "0.8.13",
+            "resolved": "https://registry.npmjs.org/xlsx-style/-/xlsx-style-0.8.13.tgz",
+            "integrity": "sha512-Cj3pGUvzrP2q9oowpLP8GyujovTaBGjBRRUlCKPitNvHWj9JDD5+FDPZIM5QQggGb995ZhkuBSsMZOSd5TzIWg==",
+            "requires": {
+                "adler-32": "",
+                "cfb": ">=0.10.0",
+                "codepage": "~1.3.6",
+                "commander": "",
+                "crc-32": "",
+                "jszip": "2.4.0",
+                "ssf": "~0.8.1"
+            },
+            "dependencies": {
+                "codepage": {
+                    "version": "1.3.8",
+                    "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz",
+                    "integrity": "sha512-cjAoQW5L/TCKWRbzt/xGBvhwJKQFhcIVO0jWQtpKQx4gr9qvXNkpRfq6gSmjjA8dB2Is/DPOb7gNwqQXP7UgTQ==",
+                    "requires": {
+                        "commander": "",
+                        "concat-stream": "",
+                        "voc": ""
+                    }
+                },
+                "colors": {
+                    "version": "0.6.2",
+                    "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+                    "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw=="
+                },
+                "frac": {
+                    "version": "0.3.1",
+                    "resolved": "https://registry.npmjs.org/frac/-/frac-0.3.1.tgz",
+                    "integrity": "sha512-1Lzf2jOjhIkRaa013KlxNOn2D9FemmQNeYUDpEIyPeFXmpLvbZXJOlaayMBT6JKXx+afQFgQ1QJ4kaF7Z07QFQ=="
+                },
+                "ssf": {
+                    "version": "0.8.2",
+                    "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.8.2.tgz",
+                    "integrity": "sha512-+ZkFDAG+ImJ48DcZvabx6YTrZ67DKkM0kbyOOtH73mbUEvNhQWWgRZrHC8+k7GuGKWQnACYLi7bj0eCt1jmosQ==",
+                    "requires": {
+                        "colors": "0.6.2",
+                        "frac": "0.3.1",
+                        "voc": ""
+                    }
+                }
+            }
+        },
+>>>>>>> Stashed changes
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",