工业级后台API v2
parent: bd0d11 | patch | commitdiff
fengxiang
2017-12-22 28fed9206419f31086c4d1f936480bfd1f2cdfc0
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:55 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 14:55 +0800
commit28fed9206419f31086c4d1f936480bfd1f2cdfc0
tree 8690dfc05f3a1e4f067915fecaaf362a943eb523 tree | zip | gz
parent bd0d111931cf15db84187e4a47e9c1e9e73affa4 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