工业级后台API v2
parent: 35c975 | patch | commitdiff
fengxiang
2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 15:12 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 15:12 +0800
commitee0e4c362e299f9be9a3859d0c142f26871cacf6
tree 91879fc06772145de4268fba0e9aba0aad781767 tree | zip | gz
parent 35c9751e86237dd20b8f23ef21f2b9daab97cee1 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
13 ■■■■■ changed files
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java 13 ●●●●● diff | view | raw | blame | history