Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 a8f678206bc9032bad6920510094df817fcb6186

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java

@@ -130,6 +130,7 @@
    @PostMapping(value = "/api/t-result-work-evaluate/add")
    public R<Boolean> add(@RequestBody String param) {
        TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);

        tResultWorkEvaluateService.save(dto);
        return R.ok();
    }
@@ -1310,6 +1311,7 @@
                Integer evaluateSix = tResultWorkEvaluate.getEvaluateSix();
                switch (evaluateSix) {
                    case 1:

                        tempDetail2 -= 3;
                        break;
                }