From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.

---
 config/dev.env.js |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 25b6b01..0f00b4b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -22,9 +22,6 @@
 
   //   BASE_API: '"http://222.92.213.21:8006/zhongtai"',
   //   IMG_API: '"http://222.92.213.21:8006/zhongtai/upload/"',
-
-
-
     // BASE_API: '"http://220.171.99.118:4101/api"',
     // IMG_API: '"http://220.171.99.118:4101/api/upload/"',
 };

--
Gitblit v1.9.2