~admin/screen_api_v2.git

工业级后台API v2

fengxiang

2018-04-20 6688e50ba02988d742baadaca156a303a90b6191

refs
author	fengxiang <110431245@qq.com>
	Friday, April 20, 2018 14:03 +0800
committer	fengxiang <110431245@qq.com>
	Friday, April 20, 2018 14:03 +0800
commit	6688e50ba02988d742baadaca156a303a90b6191
tree	8fbc009b1bc006acac8e95a79ba93c2264925686 tree \| zip \| gz
parent	74202ac7330d34d32212a13238a4da027349c7fb view \| diff 29d968d69ee52e7b0f87132467b21940fa9361cb view \| diff

Merge remote-tracking branch 'origin/master'

5 files added

4 files modified

	src/main/java/com/moral/controller/ReportController.java	32 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/controller/ScreenController.java	30 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/entity/Alarm.java	35 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/mapper/AlarmMapper.java	13 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/AlarmService.java	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/HistoryMinutelyService.java	11 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/impl/AlarmServiceImpl.java	81 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java	86 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/AlarmMapper.xml	76 ●●●●● diff \| view \| raw \| blame \| history