冲突

2021-09-23 19:31:41 +08:00 · 2021-09-23 19:31:41 +08:00 · e07590be47
parent 00629bc7f5
commit e07590be47
1 changed files with 0 additions and 2 deletions
--- 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}`
 }