fengxiang
2017-12-24 153b891aea3fab7528d497e2ededf294fa016c3a
refs
author fengxiang <110431245@qq.com>
Sunday, December 24, 2017 21:51 +0800
committer fengxiang <110431245@qq.com>
Sunday, December 24, 2017 21:51 +0800
commit153b891aea3fab7528d497e2ededf294fa016c3a
tree cd529c37dd348a83c55f81fec5afcb44c5a270f4 tree | zip | gz
parent 454e8c85ee7f47ff82fa93d502bde832c8f888f9 view | diff
Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
# src/main/java/com/moral/common/bean/PageBean.java

设备型号分页功能
7 files added
6 files modified
497 ■■■■■ changed files
src/main/java/com/moral/common/bean/PageBean.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/ExampleUtil.java 115 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/StringUtils.java 85 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/DeviceVersionController.java 18 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/MobileController.java 4 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/DeviceVersion.java 1 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/DeviceVersion.java.1 55 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/DeviceVersion.java.2 55 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/DeviceVersion.java.3 55 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/DeviceVersion.java.4 55 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DeviceVersionService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java 10 ●●●●● diff | view | raw | blame | history