Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-03 1a02af0b9943a11e2c8ab4e8665939437a7fbf16

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

@@ -224,12 +224,4 @@
    public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
        return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
    }

    @ApiOperation(value = "数采-公式计算")
    @PostMapping("/formulaCalculation")
    @ValueAuth
    public Result<?> formulaCalculation(@RequestBody Map<String, Object> map) {
        return Result.success(map);
    }
}

}