parent: cc2e35 | patch | commitdiff
cjl
2023-09-21 ff3af3a0dd0fe87a500c13e933bea1f553083508
refs
author cjl <276999030@qq.com>
Thursday, September 21, 2023 10:47 +0800
committer cjl <276999030@qq.com>
Thursday, September 21, 2023 10:47 +0800
commitff3af3a0dd0fe87a500c13e933bea1f553083508
tree 1cb4a23f63c1e965ab586317f7cea96bb69b26e8 tree | zip | gz
parent cc2e35bac3aca6d98b337a0b306c279f036ce989 view | diff
508efaad8b2e23a046c36594a9d16b372ea58a26 view | diff 
Merge remote-tracking branch 'origin/cjl' into qa

# Conflicts:
#	screen-api/pom.xml
11 files added
13 files modified
1141 ■■■■■ changed files
screen-api/pom.xml 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/DictController.java 39 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UAVController.java 12 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java 71 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/ChangeEnum.java 59 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/IntegerValueEnum.java 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/InvestigationEnum.java 60 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/StateEnum.java 57 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/StringValueEnum.java 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/YesOrNo.java 57 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java 66 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 43 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/BeanConverts.java 340 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/JsonUtils.java 151 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java 15 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java 5 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/GovMonitorPointService.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java 55 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/util/CacheUtils.java 20 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/DeviceMapper.xml 5 ●●●●● diff | view | raw | blame | history