Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

3 years ago · bc4f7ca71c
1 changed files with 1 additions and 0 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java
@ -85,6 +85,7 @@ public class EnterpriseExportExcelDTO {
    @ExcelIgnore
    private String scale;

+    @ExcelIgnore
    private Integer scaleTotal;
    /**
     * 规模名称