Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-06-26 eda704f48beacb5c68372482f73b50af3c4623fb

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java

@@ -40,9 +40,14 @@
    @PostMapping("/updateGlassMessage")
    @ResponseBody
    public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
        upWorkstationService.updateGlassMessage(upwork);
        Boolean info= upWorkstationService.updateGlassMessage(upwork);
        List<UpWorkstation> glass = upWorkstationService.list();
        return Result.build(200, "", glass);
        if(info){
            return Result.build(200, "成功", glass);
        }else{
            return Result.build(100, "失败", glass);
        }

    }