ztqt.git - Gitblit

众泰前端

shj

2022-05-16 4cc5b73a86a6c6195717c0ee18e2e82c3edb3042

refs
author	shj <1790240199@qq.com>
	Monday, May 16, 2022 09:12 +0800
committer	shj <1790240199@qq.com>
	Monday, May 16, 2022 09:12 +0800
commit	4cc5b73a86a6c6195717c0ee18e2e82c3edb3042
tree	fc2769a9c510087bf82e2b61866a5fbb185d7cdc tree \| zip \| gz
parent	674de99fbaef1ad063eacf525694dcfb22cd50e8 view \| diff ca7ec9812212102eb6a85a84a0bb5c13c3a14bd6 view \| diff

Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

# Conflicts:
#	src/permission.js

7 files modified

3 files added

	src/api/sgyhpczl/recheckCancellationNumber.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/btn.gif	diff \| view \| raw \| blame \| history
	src/permission.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/delayHiddenDangerRectification/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerManagement/fillRectificationAdd.vue	96 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerManagement/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerTroubleshootingList/index.vue	118 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/inspectionNotExist.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/send.vue	108 ●●●●● diff \| view \| raw \| blame \| history