~liuwh/gzDyh.git

forked from gzzfw/frontEnd/gzDyh

parent: 62096c | patch | commitdiff

zhangyongtian

2024-08-14 c19e349f8c93ff63b56fa550ab38d68d67c6905b

refs
author	zhangyongtian <1181606322@qq.com>
	Wednesday, August 14, 2024 11:29 +0800
committer	zhangyongtian <1181606322@qq.com>
	Wednesday, August 14, 2024 11:29 +0800
commit	c19e349f8c93ff63b56fa550ab38d68d67c6905b
tree	e925213bf50079b5d4dbab5a872708d70e203477 tree \| zip \| gz
parent	62096ceaed8a2a54bfb4298e4b0efb5eb64a7dcb view \| diff 3872b60b0c1c631f76d5cc4ab34fd1bc590cda44 view \| diff

合并冲突

3 files added

6 files modified

	gz-customerSystem/.gitignore	2 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/api/appUrl.js	10 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/assets/images/index.js	4 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/assets/images/person.png	diff \| view \| raw \| blame \| history
	gz-customerSystem/src/views/basicInformation/organization/index.jsx	780 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/views/basicInformation/organization/index.less	5 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/views/register/index.less	64 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/views/register/visit/index.jsx	405 ●●●●● diff \| view \| raw \| blame \| history
	gz-customerSystem/src/views/register/visit/preview.jsx	290 ●●●●● diff \| view \| raw \| blame \| history