Merge branch 'master' into 3.0

94d000eb · huluobin · 586c0566 · a75ac1c7 · 94d000eb
Commit 94d000eb authored Jan 15, 2021 by huluobin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CostPlanTempDomain.java ...java/com/blt/other/database/model/CostPlanTempDomain.java +1 -1

No files found.
--- a/cost-service/src/main/java/com/blt/other/database/model/CostPlanTempDomain.java
+++ b/cost-service/src/main/java/com/blt/other/database/model/CostPlanTempDomain.java
@@ -60,7 +60,7 @@ public class CostPlanTempDomain {

        CostTypeDomain costTypeDomain = costTypeDao.selectByNo(typeNo);
        if (costTypeDomain != null) {
-            dto.setTypeNo(costTypeDomain.getTypeName());
+            dto.setTypeNameDto(costTypeDomain.getTypeName());
        }
        dto.setFileName(PathUtil.getFileName(dto.getFilePath()));
        return dto;