task.git - Gitblit

工业级运维app手机api

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

refs
author	沈斌 <bluelazysb@hotmail.com>
	Friday, October 27, 2017 10:27 +0800
committer	沈斌 <bluelazysb@hotmail.com>
	Friday, October 27, 2017 10:27 +0800
commit	a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424
tree	951c89dcde9c6de0ebacea5c3df5898d0c468fda tree \| zip \| gz
parent	3b400676fd00ae2f5834c712fe66f431850c9587 view \| diff 4c42fb553b28810d358405ee34efd71981332542 view \| diff

Merge remote-tracking branch 'origin/master'

7 files modified

	src/main/java/com/moral/monitor/controller/ScreenController.java	19 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java	7 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/monitor/service/ScreenService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java	118 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/monitor/util/ResourceUtil.java	11 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/HistoryEntityMapper.xml	20 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/sysConfig.properties	28 ●●●●● diff \| view \| raw \| blame \| history