Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraVersionServiceImpl.java

@@ -112,6 +112,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());
             cameraUpdateLog.setVersionName(baseCameraVersion.getVersionName());
             cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
+            cameraUpdateLog.setStatus(2);
             cameraUpdateLog.setCreateBy(userId);
             cameraUpdateLog.setCreateTime(new Date());
             int insert = cameraUpdateLogMapper.insert(cameraUpdateLog);

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraVersionController.java

@@ -65,7 +65,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "相机列表")
-    @GetMapping("/cameraAllList")
+    @PostMapping("/cameraAllList")
     @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
     public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.cameraAllList(baseCameraManagement);