工业级后台API v2
parent: 153b89 | patch | commitdiff
fengxiang
2017-12-27 d07553f8cfdc4ce407122f905b49191b8ffbc7fb
refs
author fengxiang <110431245@qq.com>
Wednesday, December 27, 2017 10:19 +0800
committer fengxiang <110431245@qq.com>
Wednesday, December 27, 2017 10:19 +0800
commitd07553f8cfdc4ce407122f905b49191b8ffbc7fb
tree f074ef0115cf80b620925d5ed0b11132c83854ac tree | zip | gz
parent 153b891aea3fab7528d497e2ededf294fa016c3a view | diff 
Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java
4 files deleted
2 files modified
226 ■■■■■ changed files
src/main/java/com/moral/common/util/ExampleUtil.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/util/StringUtils.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