Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试

3 years ago · 1502d7e325
2 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@ -397,7 +397,7 @@ public class IcResiUserController implements ResultDataResolver {
    }

    /**
-     * desc:根据客户id 下载模版文件 如果不存在则返回null
+     * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null
     *
     * @param customerId
     * @return
--- a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx