Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -229,7 +229,7 @@
    @PostMapping("/formulaCalculation")
    @ValueAuth
    public Result<?> formulaCalculation(@RequestBody Map<String, Object> map) {
        return Result.success(deviceService.formulaCalculation(map, false));
        return Result.success(map);
    }
}