解决冲突提交本地

2018-03-17 17:09:19 +08:00
parent b96389e37f
commit d5a2a32c51
25 changed files with 2737 additions and 8 deletions
--- a/src/main/webapp/WEB-INF/tlds/fns.tld
+++ b/src/main/webapp/WEB-INF/tlds/fns.tld
@@ -311,6 +311,14 @@
    <example>${fns:getSysDictInfoById(id)}</example>  
  </function>
  
+   <function>
+    <description>根据id获取特定服务配置</description>
+    <name>getBySpecServiceId</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.lang.String getBySpecServiceId(java.lang.Integer)</function-signature>
+    <example>${fns:getBySpecServiceId(id)}</example>  
+  </function>
+  
  <!-- 计算序号 -->
     <function>
    <description>计算序号</description>