Merge remote-tracking branch 'origin/master'

zhangherong

7 天以前 6722e123b7a54dcc6c6937bc4324c67293f233db

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java

@@ -68,9 +68,9 @@
        }
        boolean b = eamTechnicalStatusEvaluationOrderChangeService.addTechnicalStatusEvaluationOrderChange(request);
        if (!b) {
            return Result.error("添加失败！");
            return Result.error("变更失败！");
        }
        return Result.OK("添加成功！");
        return Result.OK("变更成功！");
    }

    /**