工业级后台API v2
parent: 5b556b | patch | commitdiff
fengxiang
2017-12-29 9668ce3911266c1c3810c047408cc58e03086139
refs
author fengxiang <110431245@qq.com>
Friday, December 29, 2017 16:56 +0800
committer fengxiang <110431245@qq.com>
Friday, December 29, 2017 16:56 +0800
commit9668ce3911266c1c3810c047408cc58e03086139
tree 6f991709f006c244aaf5db01ae4e327bca8a319b tree | zip | gz
parent 5b556b5a79433f7989fab10566fea5c1ea9c34da view | diff 
Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java
6 files modified
77 ■■■■■ changed files
src/main/java/com/moral/common/bean/PageBean.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/ExampleUtil.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/DeviceVersionController.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DeviceVersionService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java 28 ●●●●● diff | view | raw | blame | history