~admin/screen_api_v2.git

工业级后台API v2

fengxiang

2018-06-22 0fd34e51dadbf9598188b0e061b658139e6d6257

refs
author	fengxiang <110431245@qq.com>
	Friday, June 22, 2018 13:47 +0800
committer	fengxiang <110431245@qq.com>
	Friday, June 22, 2018 13:47 +0800
commit	0fd34e51dadbf9598188b0e061b658139e6d6257
tree	3e464521c4479ab968396e2a19a99b29e2786488 tree \| zip \| gz
parent	2f6f3f994a8df81bd3dfa873e165d46b198c189c view \| diff cea9aba8d0e4833bac428d071664cbe84e6180c9 view \| diff

Merge remote-tracking branch 'origin/master'

1 files added

8 files modified

	pom.xml	11 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/config/SwaggerConfig.java	42 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/controller/ScreenController.java	21 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/mapper/HistoryMapper.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/HistoryService.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/impl/HistoryServiceImpl.java	80 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/HistoryMapper.xml	64 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/HistoryMinutelyMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/system/sysConfig.properties	2 ●●●●● diff \| view \| raw \| blame \| history