工业级后台API v2
parent: 8ad473 | patch | commitdiff
fengxiang
2017-12-22 454e8c85ee7f47ff82fa93d502bde832c8f888f9
refs
author fengxiang <110431245@qq.com>
Friday, December 22, 2017 16:18 +0800
committer fengxiang <110431245@qq.com>
Friday, December 22, 2017 16:18 +0800
commit454e8c85ee7f47ff82fa93d502bde832c8f888f9
tree fce462fe2f3d5e261b1bcfec1b20c0b40e6c465e tree | zip | gz
parent 8ad473d0e87886501a73cc408ebe7efbff25f373 view | diff 
Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java
2 files modified
23 ■■■■■ changed files
src/main/java/com/moral/mapper/DeviceVersionMapper.java 1 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DeviceVersionMapper.xml 22 ●●●●● diff | view | raw | blame | history