jczz_app.git - Gitblit

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

guoshilong

2023-11-06 f31d84d27d9212bb30a14fdd876996510c1df240

refs
author	guoshilong <123456>
	Monday, November 6, 2023 10:33 +0800
committer	guoshilong <123456>
	Monday, November 6, 2023 10:33 +0800
commit	f31d84d27d9212bb30a14fdd876996510c1df240
tree	e5926d3b5aa94f046f6b321176f2b8925f4b89cc tree \| zip \| gz
parent	709941a83810c4069f6caa2899c5f0c886671497 view \| diff a3f6fb796222a1afc37e748495bd6b515a4c4c53 view \| diff

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

# Conflicts:
#	subPackage/workbench/views/cscj.vue

14 files modified

19 files added

	api/doorplateAddress/doorplateAddress.js	15 ●●●●● diff \| view \| raw \| blame \| history
	api/house/houseLabel.js	9 ●●●●● diff \| view \| raw \| blame \| history
	api/house/household.js	30 ●●●●● diff \| view \| raw \| blame \| history
	api/house/householdLabel.js	21 ●●●●● diff \| view \| raw \| blame \| history
	api/system/dict.js	2 ●●●●● diff \| view \| raw \| blame \| history
	pages.json	29 ●●●●● diff \| view \| raw \| blame \| history
	pages/home/index.vue	27 ●●●●● diff \| view \| raw \| blame \| history
	pages/login/login-account.vue	78 ●●●●● diff \| view \| raw \| blame \| history
	static/base.css	3 ●●●●● diff \| view \| raw \| blame \| history
	static/icon/list-01.png	diff \| view \| raw \| blame \| history
	static/icon/list-02.png	diff \| view \| raw \| blame \| history
	static/icon/login-title.png	diff \| view \| raw \| blame \| history
	static/icon/nav-09.png	diff \| view \| raw \| blame \| history
	static/icon/nav-10.png	diff \| view \| raw \| blame \| history
	static/icon/nav-bg-06.png	diff \| view \| raw \| blame \| history
	static/icon/nav-bg-07.png	diff \| view \| raw \| blame \| history
	static/icon/nav-bg-08.png	diff \| view \| raw \| blame \| history
	static/icon/nav-bg-09.png	diff \| view \| raw \| blame \| history
	static/img/repair-bg.png	diff \| view \| raw \| blame \| history
	subPackage/bs/views/rentDetail.vue	54 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/bs/views/repair.vue	194 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/family/index.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/list/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/member/householdLabel.vue	333 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/member/index.vue	411 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/roomControl/index.vue	159 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/house/roomDetails/index.vue	69 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/workbench/views/cscj.vue	121 ●●●●● diff \| view \| raw \| blame \| history
	subPackage/workbench/views/rental.vue	188 ●●●●● diff \| view \| raw \| blame \| history
	uni_modules/chenchuang-CCDropDownFilter/changelog.md	8 ●●●●● diff \| view \| raw \| blame \| history
	uni_modules/chenchuang-CCDropDownFilter/components/chenchuang-CCDropDownFilter/chenchuang-CCDropDownFilter.vue	242 ●●●●● diff \| view \| raw \| blame \| history
	uni_modules/chenchuang-CCDropDownFilter/package.json	84 ●●●●● diff \| view \| raw \| blame \| history
	uni_modules/chenchuang-CCDropDownFilter/readme.md	222 ●●●●● diff \| view \| raw \| blame \| history