parent: 0aed1c | patch | commitdiff
kaiyu
2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c
refs
author kaiyu <404897439@qq.com>
Tuesday, September 14, 2021 10:26 +0800
committer kaiyu <404897439@qq.com>
Tuesday, September 14, 2021 10:26 +0800
commit82841afc4e140f72fdeb378102e0e9a978bbe14c
tree f1b0ba7146e0d2ea871b20365921606e6772afd9 tree | zip | gz
parent 0aed1c0e6a91207c15fa34f49a7dfa9b6e2b64c5 view | diff
1ab0b018c6d0b5a12b5310ae23f37cb9e5a2887b view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
#	screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
3 files modified
17 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 1 ●●●●● diff | view | raw | blame | history