Merge branch 'apps_dev_ydq_process_list' into apps_dev
# Conflicts: # com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java
This commit is contained in:
commit
e623f084f3
@ -899,9 +899,9 @@ public class PALRepositoryListWeb extends ActionWeb {
|
||||
//最后修改时间
|
||||
map.put("modify_date", getJsonObject("modify_date", "modify_date", "修改时间", "修改时间", "150", "150", false, columnType, "default"));
|
||||
//文件ID
|
||||
map.put("file_id", getJsonObject("file_id", "file_id", "文件ID", "文件ID", "150", "150", false, columnType, "default"));
|
||||
map.put("file_id", getJsonObject("file_id", "file_id", "版本ID", "版本ID", "150", "150", false, columnType, "default"));
|
||||
//文件组ID
|
||||
map.put("group_id", getJsonObject("group_id", "group_id", "文件组ID", "文件组ID", "150", "150", false, columnType, "default"));
|
||||
map.put("group_id", getJsonObject("group_id", "group_id", "模型ID", "模型ID", "150", "150", false, columnType, "default"));
|
||||
// map.put("parent_name",getJsonObject("parent_name","parent_name","上级名称","上级名称","250","250",false,columnType,"name"));
|
||||
}
|
||||
return map;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user