forked from moral

parent: 48bd10 | patch | commitdiff
jinpengyong
2023-09-22 3271a0e7421aa7c55f475be8f24ad85b576108b8
refs
author jinpengyong <jpy123456>
Friday, September 22, 2023 16:17 +0800
committer jinpengyong <jpy123456>
Friday, September 22, 2023 16:17 +0800
commit3271a0e7421aa7c55f475be8f24ad85b576108b8
tree f381a296c0e8ccf5dda0cb842aae948e709bfd46 tree | zip | gz
parent 48bd10b213992dd416620e338cf732ee972110de view | diff
508efaad8b2e23a046c36594a9d16b372ea58a26 view | diff 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

 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