~admin/screen_api_v2.git

工业级后台API v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

refs
author	ZhuDongming <773644075@qq.com>
	Thursday, August 8, 2019 17:03 +0800
committer	ZhuDongming <773644075@qq.com>
	Thursday, August 8, 2019 17:03 +0800
commit	2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea
tree	8828eb83522440e08b31b9c27c719d0f45adcd1b tree \| zip \| gz
parent	90a6386cda8e3356c23f283656bf94e21e94b46a view \| diff a6ff89dd8eed9ea4e6162ff5491d4583e4ef621a view \| diff

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

5 files modified

	src/main/java/com/moral/controller/ScreenController.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/mapper/HistoryMapper.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/HistoryService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/impl/HistoryServiceImpl.java	22 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/HistoryMapper.xml	7 ●●●●● diff \| view \| raw \| blame \| history