工业级后台API v2
parent: 28fed9 | patch | commitdiff
fengxiang
2017-12-22 35c9751e86237dd20b8f23ef21f2b9daab97cee1
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:56 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:56 +0800
commit35c9751e86237dd20b8f23ef21f2b9daab97cee1
tree 46787043331b726c999ead178d6e0222307216ce tree | zip | gz
parent 28fed9206419f31086c4d1f936480bfd1f2cdfc0 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 modified
1 ■■■■■ changed files
src/main/java/com/moral/controller/DeviceVersionController.java 1 ●●●●● diff | view | raw | blame | history