Merge remote-tracking branch 'origin/master'

lyh

5 天以前 ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9

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

@@ -53,6 +53,7 @@
            for(EamTechnicalStatusChangeDetail vo : list) {
                String json = objectMapper.writeValueAsString(vo);
                JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
                translateDictTextUtils.translateField("acceptanceChecker", vo.getAcceptanceChecker(), item, "sys_user,realname,username");
                translateDictTextUtils.translateField("changeCategory", vo.getChangeCategory(), item, "technical_status_change_reason");
                translateDictTextUtils.translateField("changeTechnicalStatus", vo.getChangeTechnicalStatus(), item, "equipment_technology_status");
                translateDictTextUtils.translateField("acceptanceCheckResult", vo.getAcceptanceCheckResult(), item, "equipment_technology_status");