From 8c6c47b91f66d893e9c09ca2ea924a3cec72d7af Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 19 Jul 2016 10:21:01 +0800 Subject: [PATCH] =?UTF-8?q?jeecg=203.6.5=20=E6=B3=A8=E9=87=8A=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tld/easyui.tld | 3 --- .../Formdesign/js/ueditor/formdesign/checkboxs.html | 4 ---- .../Formdesign/js/ueditor/formdesign/listctrl.html | 8 -------- .../Formdesign/js/ueditor/formdesign/radios.html | 4 ---- .../Formdesign/js/ueditor/formdesign/select.html | 6 ------ .../plug-in/Formdesign/js/ueditor/formdesign/text.html | 10 ---------- .../Formdesign/js/ueditor/formdesign/textarea.html | 2 -- .../webpage/jeecg/demo/base/report/reportDemo.jsp | 1 - src/main/webapp/webpage/main/ace_main.jsp | 3 --- src/main/webapp/webpage/main/ace_main2.jsp | 3 --- src/main/webapp/webpage/main/diy.jsp | 1 - src/main/webapp/webpage/main/homeTab.jsp | 1 - src/main/webapp/webpage/main/sliding_top.jsp | 2 -- src/main/webapp/webpage/system/category/category.jsp | 2 -- src/main/webapp/webpage/system/user/noticeList.jsp | 1 - 15 files changed, 51 deletions(-) diff --git a/src/main/webapp/WEB-INF/tld/easyui.tld b/src/main/webapp/WEB-INF/tld/easyui.tld index f2650d9b..74769aa0 100644 --- a/src/main/webapp/WEB-INF/tld/easyui.tld +++ b/src/main/webapp/WEB-INF/tld/easyui.tld @@ -1441,7 +1441,6 @@ true 是否可编辑-默认是可以编辑 - -end- Author:jg_xugj 许国杰 Date:20151209 for：增加只读属性 --> @@ -1508,7 +1507,6 @@ true 部门名称 - -end- Author:jg_renjie Date:20160320 for：增加传入值 --> userSelect @@ -1560,6 +1558,5 @@ true 弹出框标头 - -end- Author:wangkun Date:20160327 for：增加传入值 --> \ No newline at end of file diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html index 123c9029..bed9120d 100644 --- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html +++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html @@ -213,18 +213,14 @@ function fnParseOptions(gChecked) 字段 - --Author:jg_renjie Date:20150717 for：将input修改为select--> - -end--Author:jg_renjie Date:20150717 for：将input修改为select --> 数据字典 diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html index 4570f6ce..75a458ab 100644 --- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html +++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html @@ -2,18 +2,14 @@ 列表控件属性 - --Author:jg_renjie Date:20150725 for：添加页面相对路径--> - -end--Author:jg_renjie Date:20150725 for：添加页面相对路径--> - --Author:jg_renjie Date:20150725 for：修改文件的引用路径--> - -end--Author:jg_renjie Date:20150725 for：修改文件的引用路径--> - -end--Author:jg_renjie Date:20150717 for：修改文件的引用路径--> --end--Author:gaofeng Date:2014-01-10 for:新增首页风格 --> diff --git a/src/main/webapp/webpage/system/category/category.jsp b/src/main/webapp/webpage/system/category/category.jsp index 0f5e3362..c3b1dbc5 100644 --- a/src/main/webapp/webpage/system/category/category.jsp +++ b/src/main/webapp/webpage/system/category/category.jsp @@ -54,9 +54,7 @@ - -start--Author:luobaoli Date:20150606 for：将父ID传到后台，避免更新为空 --> - -end--Author:luobaoli Date:20150606 for：将父ID传到后台，避免更新为空 --> Author:xugj Date:20160330 for：#1012 【平台bug】系统公告列表时间格式不对 --> - -end Author:xugj Date:20160330 for：#1012 【平台bug】系统公告列表时间格式不对 -->