zhny-dsjdp.git - Gitblit

智慧农业大数据平台

zengh

2022-07-08 6f5331c9ba8b6ba44b45b6a89d7c7c813ab8052d

refs
author	zengh <123456>
	Friday, July 8, 2022 20:28 +0800
committer	zengh <123456>
	Friday, July 8, 2022 20:28 +0800
commit	6f5331c9ba8b6ba44b45b6a89d7c7c813ab8052d
tree	7d9b88b691c43d0ea3ad84f4592bddef866ae277 tree \| zip \| gz
parent	29f26f36a9617fdccfdf758fd462a87774a868cb view \| diff dde865a1bab3dc70fd711ca7de839f988a67dd60 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/styles/index.scss

5 files modified

2 files added

	src/components/remote/index.vue	128 ●●●●● diff \| view \| raw \| blame \| history
	src/components/selectTime/index.vue	307 ●●●●● diff \| view \| raw \| blame \| history
	src/components/splitScreen/index.vue	153 ●●●●● diff \| view \| raw \| blame \| history
	src/components/timeLine/index.vue	371 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/index.scss	1 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/publicBox/trace-table.scss	141 ●●●●● diff \| view \| raw \| blame \| history
	src/views/farm/index.vue	320 ●●●●● diff \| view \| raw \| blame \| history