zhny-dsjdp.git - Gitblit

智慧农业大数据平台

zengh

2022-07-08 3720e2ca52962794aec5a7cc965ccdce98fe0496

refs
author	zengh <123456>
	Friday, July 8, 2022 14:12 +0800
committer	zengh <123456>
	Friday, July 8, 2022 14:12 +0800
commit	3720e2ca52962794aec5a7cc965ccdce98fe0496
tree	3eaf85457dcb82167e997db3df61a5ffb2e3b325 tree \| zip \| gz
parent	912994d10fd30dd73f08781777eb794b5ea5eaa9 view \| diff 7bae7846f121b3b95c5dc3c439d17e056267f589 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/manage/index.vue

4 files modified

7 files added

	public/img/icon/1016.png	diff \| view \| raw \| blame \| history
	public/img/icon/360.png	diff \| view \| raw \| blame \| history
	public/img/icon/3666.png	diff \| view \| raw \| blame \| history
	public/img/icon/public-close.png	diff \| view \| raw \| blame \| history
	src/components/publicBox/index.vue	29 ●●●●● diff \| view \| raw \| blame \| history
	src/router/page/index.js	9 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/element-ui.scss	25 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/index.scss	1 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/publicBox/arc-nav-bar.scss	141 ●●●●● diff \| view \| raw \| blame \| history
	src/views/farm/index.vue	207 ●●●●● diff \| view \| raw \| blame \| history
	src/views/home/index.vue	65 ●●●●● diff \| view \| raw \| blame \| history