From d297132aba417a5cc5ea4330d9134341738184dc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 05 Nov 2021 17:32:17 +0800
Subject: [PATCH] 冲突

---
 src/page/login/codelogin.vue |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index 73152c3..4db4c1d 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -166,7 +166,6 @@
   mounted() {
     var that = this;
     ss().then((res) => {
-      console.log(that.ergodicData(res.data.data), 898989);
       that.dic = that.ergodicData(res.data.data);
     });
   },
@@ -236,7 +235,6 @@
     },
     async allmedia() {
       ss().then((res) => {
-        console.log(res, 1323);
         res.data.data.forEach((element) => {
           this.options.push({
             deptname: element.dept_name,

--
Gitblit v1.9.3