Merge remote-tracking branch 'origin/master'

zss

2024-07-31 9895be644e5f4d8b03170fcdfedb9fc57d90f2d8

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

@@ -283,6 +283,7 @@

    @ApiOperation(value = "温度循环数采总体")
    @PostMapping("/temDataAcquisition2")
    @ValueAuth
    public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
        return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
    }