screen_demo2.git

招投标-河南禹州

fengxiang

2018-06-19 899b4ddd9790728851834062c57892f600ee4355

refs
author	fengxiang <110431245@qq.com>
	Tuesday, June 19, 2018 11:23 +0800
committer	fengxiang <110431245@qq.com>
	Tuesday, June 19, 2018 11:23 +0800
commit	899b4ddd9790728851834062c57892f600ee4355
tree	7127ef42dc23bfa904cf311fc47429eea5e99778 tree \| zip \| gz
parent	565f5b26ee306966f0b4b9447b7a8f9b04a9fe00 view \| diff 4d0fd6e3bb6c3dcd48763338255075e2662622e6 view \| diff

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

7 files modified

	src/app/business/entity/data.ts	5 ●●●●● diff \| view \| raw \| blame \| history
	src/app/business/services/http/areacode.service.ts	29 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts	15 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/devices/monitor-point/monitor-point.component.ts	7 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/reports/demo/demo.component.html	4 ●●●●● diff \| view \| raw \| blame \| history
	src/app/routes/reports/demo/demo.component.ts	39 ●●●●● diff \| view \| raw \| blame \| history