Merge branch 'main' of http://106.15.139.36:30000/bestunion/Otsuka-APP

.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vue3git版</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1757318566783</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

config.js

@@ -2,6 +2,10 @@
 export default {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',   //
    // baseUrl: '/prod-api',    //前后端分离版的接口地址，转发代理 设置在了manifest.json文件中
+<<<<<<< HEAD
+   // baseUrl: 'http://192.168.3.27:18090',    //前后端分离版的接口地址
+=======
+>>>>>>> 58da6a52b9b5baa9a2c6179775a634eecca96b80
    baseUrl: 'http://106.15.139.36:18090',    //前后端分离版的接口地址
     //测试提交
   // 应用信息