forked from moral

parent: 28f4ff | patch | commitdiff
lizijie
2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794
refs
author lizijie <lzjiiie@163.com>
Tuesday, August 31, 2021 17:09 +0800
committer lizijie <lzjiiie@163.com>
Tuesday, August 31, 2021 17:09 +0800
commitb888331b6ba56caeeab12a4543fe81bac8854794
tree 608bf08878df8d29ebd857b8a9cf660f154f66a7 tree | zip | gz
parent 28f4ff909e7ea29f7c2688ecd8346af9f8c063ca view | diff
9c83d6bf41457e97a343c867f5b5261f222c158d view | diff 
Merge remote-tracking branch 'origin/dev' into dev
5 files added
5 files modified
264 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/UAVController.java 45 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java 56 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java 16 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java 16 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/KafkaConstants.java 32 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java 73 ●●●●● diff | view | raw | blame | history