From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突
---
public/papersApply.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/papersApply.html b/public/papersApply.html
index 3682b04..a3300db 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -77,8 +77,8 @@
var name = JSON.parse(getData("data")).name;
// console.log(JSON.parse(getData("data")), 111);
- // axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
- axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
var data = res.data;
var list = data.applyList;
console.log(data, 123);
--
Gitblit v1.9.3