diff --git a/js/huaxia.js b/js/huaxia.js
index 51b4675..55aa192 100644
--- a/js/huaxia.js
+++ b/js/huaxia.js
@@ -469,7 +469,6 @@ function goJGDetail(e) { //查看机构详情
 }
 
 function checkPeo() { //查询机构成员列表
->>>>>>> 94dd9be6b353522b96731800faf9701704c20cb4
 	let jgmHtml = '';
 	let jgmData = [{
 			imgSrc: '../../img/public/jg-dp-01.png',
@@ -885,7 +884,6 @@ function checkPXList() { //拍卖全部商品事件
 }
 
 function goPXDetail(e) { //查看培训详情
->>>>>>> 94dd9be6b353522b96731800faf9701704c20cb4
 	location.href = `trainDetail.html?id=${e}`
 }