parent: 8c96d7 | patch | commitdiff
jinpengyong
2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56
refs
author jinpengyong <jpy123456>
Wednesday, June 23, 2021 14:46 +0800
committer jinpengyong <jpy123456>
Wednesday, June 23, 2021 14:46 +0800
commit6f12948893fcc846dfb32aa861c473a842edcd56
tree b9cfb70e5cec6f2ca85763fa599154678546c036 tree | zip | gz
parent 8c96d7fe40bf25d8c2bf7e4cbb1c306e10820547 view | diff
5981f3413b9db0dea9ef7b5e33fd39d214ebb636 view | diff 
Merge remote-tracking branch 'origin/dev' into dev_

# Conflicts:
#	screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
6 files modified
181 ■■■■■ changed files
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/TestController.java 5 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java 17 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 79 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java 72 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/util/CacheUtils.java 5 ●●●●● diff | view | raw | blame | history