ztqt.git - Gitblit

众泰前端

shj

2022-05-16 0717ac4c0a2182388d62fbbb64da56559d58e761

refs
author	shj <1790240199@qq.com>
	Monday, May 16, 2022 10:01 +0800
committer	shj <1790240199@qq.com>
	Monday, May 16, 2022 10:01 +0800
commit	0717ac4c0a2182388d62fbbb64da56559d58e761
tree	74e4aa4c7435b943ef75b942d09b6ea610b7086c tree \| zip \| gz
parent	dc3640ed779c020e1fe931a504e76b74fc02394c view \| diff eeda2785150e807e36391ebeeeb885973f495ffc view \| diff

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

# Conflicts:
#	src/permission.js
#	src/router/index.js

2 files modified

4 files added

	src/permission.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	35 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Issuedbysuperiors/superiorsSend.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/index.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/superiorsSend.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/index.vue	13 ●●●●● diff \| view \| raw \| blame \| history