~admin/srs-police-affairs.git

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-03-29 5ab15852cea6332f55f7a0f0366b66e24119d30d

refs
author	shuishen <1109946754@qq.com>
	Wednesday, March 29, 2023 00:07 +0800
committer	shuishen <1109946754@qq.com>
	Wednesday, March 29, 2023 00:07 +0800
commit	5ab15852cea6332f55f7a0f0366b66e24119d30d
tree	b84e3f159b36d41904991e6da18d04934de83f36 tree \| zip \| gz
parent	1f48971edb82a95675552eb9563041b5aef3a306 view \| diff 17f223f1faa6f34d2f5cceab3303172ce32cf9e6 view \| diff

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

16 files modified

1 files deleted

5 files added

	public/img/icon/keypeople.png	diff \| view \| raw \| blame \| history
	public/img/icon/school.png	diff \| view \| raw \| blame \| history
	public/static/config.js	5 ●●●●● diff \| view \| raw \| blame \| history
	src/components/map/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/components/mapSearchBox/index.vue	31 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/user.js	14 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/base/index.scss	6 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/media/index.scss	38 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/activityDetail.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/components/drawBtnBox.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/index.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	src/views/activity/index1.vue	38 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/11.json	75973 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/bottomContainer.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/components/leftContainer.vue	129 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/homeleft/hotal.js	682 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/homeleft/keyPeople.js	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/homeleft/school.js	469 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.vue	147 ●●●●● diff \| view \| raw \| blame \| history
	src/views/house/index.vue	90 ●●●●● diff \| view \| raw \| blame \| history
	src/views/video/list.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	vue.config.js	4 ●●●●● diff \| view \| raw \| blame \| history