jfptxcx.git - Gitblit

南昌市物联网技防平台-小程序

Merge remote-tracking branch 'origin/master'

zengh

2021-05-28 fdc8044841d4f0448484f2bd681a5dc40c1293bd

refs
author	zengh <123456>
	Friday, May 28, 2021 18:11 +0800
committer	zengh <123456>
	Friday, May 28, 2021 18:11 +0800
commit	fdc8044841d4f0448484f2bd681a5dc40c1293bd
tree	77c45f90b83031228f256583690b3fddf93373c3 tree \| zip \| gz
parent	8574fe6d374903cf93ba61fbcb4d8b1adc9f4ab3 view \| diff d1d1bd3566aeab1a41f64826323e1d69e275f5e1 view \| diff

Merge remote-tracking branch 'origin/master'

11 files modified

1 files renamed

11 files added

	manifest.json	2 ●●●●● diff \| view \| raw \| blame \| history
	pages.json	40 ●●●●● diff \| view \| raw \| blame \| history
	pages/infoRegistration/infoCheck.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	pages/infoRegistration/infoRegistration.vue	180 ●●●●● diff \| view \| raw \| blame \| history
	pages/loging/loging.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/childen/aboutUs.vue	65 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/childen/genxin.vue	87 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/childen/shezhi.vue	19 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/childen/xinxi.vue	72 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/childen/yijian.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	pages/myself/myself.vue	277 ●●●●● diff \| view \| raw \| blame \| history
	pages/riskReporting/riskReporting.vue	84 ●●●●● diff \| view \| raw \| blame \| history
	pages/visitRecord/visitRecord.vue	72 ●●●●● diff \| view \| raw \| blame \| history
	pages/workbench/workbench.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	static/myself/denghcu.png	diff \| view \| raw \| blame \| history
	static/myself/gaunyu.png	diff \| view \| raw \| blame \| history
	static/myself/gengxin.png	diff \| view \| raw \| blame \| history
	static/myself/shezhi.png	diff \| view \| raw \| blame \| history
	static/myself/yijian.png	diff \| view \| raw \| blame \| history
	static/myself/zhanhu.png	diff \| view \| raw \| blame \| history
	static/users.png	diff \| view \| raw \| blame \| history
	store/actions.js	12 ●●●●● diff \| view \| raw \| blame \| history
	store/mutations.js	2 ●●●●● diff \| view \| raw \| blame \| history