工业级后台API v2
parent: c147c2 | patch | commitdiff
fengxiang
2017-12-22 01329695ebf6eea6576d76825181b2f3833297e8
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 16:12 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 16:12 +0800
commit01329695ebf6eea6576d76825181b2f3833297e8
tree ef9ef16b12f2a574ff1d1530b02a3a5daa479dbb tree | zip | gz
parent c147c2a80eb1353e7b54b73b72615952f29c6287 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
3 ■■■■■ changed files
src/main/java/com/moral/entity/DeviceVersion.java 3 ●●●●● diff | view | raw | blame | history