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