Merge branch 'dev_footbar' into dev_temp

5 years ago · 41f1cac4fb
2 changed files with 3 additions and 0 deletions
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java
@ -106,4 +106,6 @@ public class CustomerFootBarResultDTO implements Serializable {
 	private String defaultSelectedIconPath;
 	private String defaultPageTitle;
 }
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
@ -187,6 +187,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
        dto.setDefaultBarName(defaultBar.getBarName());
        dto.setDefaultIconPath(defaultBar.getIconPath());
        dto.setDefaultSelectedIconPath(defaultBar.getSelectedIconPath());
        dto.setDefaultPageTitle(defaultBar.getPageTitle());
        return dto;
    }