From 5e2771f2bef70f5f598b221509dd1ea9cc7e8191 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期二, 27 八月 2024 17:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
src/main/java/com/product/file/service/DocumentService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index d10298b..fa8ad64 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -383,12 +383,12 @@
sql.append(" and tricode_parent = ? ");
//鍔犺浇鏂囦欢璺緞
DataTableEntity dataTableEntity = documentDirectoryService.getDirectoryStructure(fse);
- object.put("PRODUCT_OA_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
+ object.put("product_oa_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
}
//sql.append(" GROUP BY tricode,tricode_parent,directory_name");
DataTableEntity data = baseDao.listTable(sql.toString(), param.toArray());
- object.put("PRODUCT_OA_directory_sub", BaseUtil.dataTableEntityToJson(data));
+ object.put("product_oa_directory_sub", BaseUtil.dataTableEntityToJson(data));
baseDao.listInternationDataTable(data, null);
return object;
--
Gitblit v1.9.2