~admin/zhba_enterprises.git

liuyg

2021-09-06 c263633394b00cc13231f532257cef520c1b3bcb

refs
author	liuyg <376836862@qq.com>
	Monday, September 6, 2021 16:44 +0800
committer	liuyg <376836862@qq.com>
	Monday, September 6, 2021 16:44 +0800
commit	c263633394b00cc13231f532257cef520c1b3bcb
tree	f794a8e54ca6a586a25a5999bf59cd370ba551f9 tree \| zip \| gz
parent	bb813878bdfeca0318e292fe8292976da86cb57b view \| diff ee2dd46769eb0949441b151aa57dd18ec148c015 view \| diff

解决冲突

7 files modified

	src/api/trainingRegistration/trainingRegistration.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/page/login/codelogin.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/companyApply/index.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/traincompany/index.vue	17 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/data.js	7 ●●●●● diff \| view \| raw \| blame \| history
	src/views/trainingRegistration/index.vue	107 ●●●●● diff \| view \| raw \| blame \| history
	src/views/zc/zc.vue	21 ●●●●● diff \| view \| raw \| blame \| history