screen_demo2.git

招投标-河南禹州

fengxiang

2017-12-20 124766132b01645c9942f4cadd7cb88953bfc728

refs
author	fengxiang <fengxiang>
	Wednesday, December 20, 2017 14:00 +0800
committer	fengxiang <fengxiang>
	Wednesday, December 20, 2017 14:00 +0800
commit	124766132b01645c9942f4cadd7cb88953bfc728
tree	ab33c91c6ad945806c1e8c0fa09212a6aadbce60 tree \| zip \| gz
parent	3963396bffa74454217500f5d56552a352968b40 view \| diff 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 view \| diff

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

4 files added

7 files modified

	src/app/app.module.ts	2 ●●●●● diff \| view \| raw \| blame \| history
	src/app/core/services/date.service.ts	11 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/routes.ts	1 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/systems/account/account.component.html	3 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/systems/account/account.component.ts	25 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/systems/systems.module.ts	32 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/users/installer/edit/edit.component.ts	8 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/users/installer/installer.component.html	4 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/users/installer/installer.component.ts	7 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/app-data.json	10 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/i18n/zh-CN.json	3 ●●●●● diff \| view \| raw \| blame \| history