冲突

src/assets/less/index.less

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .type-time{
   text-align: right;
   padding-right: 4%;
@@ -25,4 +26,24 @@
   .unSelect{
     color: #A3A4A4;
   }
+=======
+*::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+*::-webkit-scrollbar-button {
+  width: 0;
+  height: 0;
+  display: none;
+}
+*::-webkit-scrollbar-corner {
+  background-color: transparent;
+}
+*::-webkit-scrollbar-thumb {
+  border: 4px solid rgba(0, 0, 0, 0);
+  height: 6px;
+  border-radius: 25px;
+  background-clip: padding-box;
+  background-color: rgba(0, 0, 0, 0.30);
+>>>>>>> 330154ae420452f6810cf7e7b439383c13ab5114
 }

src/assets/ts/antd.ts

@@ -0,0 +1,12 @@
+import type {App} from 'vue';
+import {
+    Form,
+    Input,
+    Button,
+} from 'ant-design-vue';
+
+export default function registerGlobComp(app: App) {
+    app.use(Button)
+        .use(Form)
+        .use(Input)
+}