工业级后台API v2
parent: 66489d | patch | commitdiff
fengxiang
2017-12-22 bd0d111931cf15db84187e4a47e9c1e9e73affa4
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
commitbd0d111931cf15db84187e4a47e9c1e9e73affa4
tree 46787043331b726c999ead178d6e0222307216ce tree | zip | gz
parent 66489dc04eb54b395ee9558de23e3a5767bb37c0 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
8 ■■■■■ changed files
src/main/java/com/moral/controller/DeviceVersionController.java 8 ●●●●● diff | view | raw | blame | history