工业级后台API v2
parent: eb5623 | patch | commitdiff
fengxiang
2017-12-22 66489dc04eb54b395ee9558de23e3a5767bb37c0
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:52 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:52 +0800
commit66489dc04eb54b395ee9558de23e3a5767bb37c0
tree 52e728f55a385a93200b013d9e49ac1f388dc979 tree | zip | gz
parent eb5623f3b6074fb81045e9176889fd8d61706649 view | diff 
Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java
1 files added
4 ■■■■■ changed files
src/main/java/com/moral/controller/DeviceVersionController.java 4 ●●●●● diff | view | raw | blame | history