diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/jform.ftl b/src/main/java/org/jeecgframework/web/cgform/engine/jform.ftl
index bb87be6c..7b14199d 100644
--- a/src/main/java/org/jeecgframework/web/cgform/engine/jform.ftl
+++ b/src/main/java/org/jeecgframework/web/cgform/engine/jform.ftl
@@ -29,7 +29,6 @@
 						</label>
 					</td>
 					<td class="value">
-						<!--update-begin--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
 							<!--如果为树形菜单，父id输入框设置为select-->
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@@ -73,7 +72,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							       style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -340,11 +338,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/jformunion.ftl b/src/main/java/org/jeecgframework/web/cgform/engine/jformunion.ftl
index 459c16b0..1a694f86 100644
--- a/src/main/java/org/jeecgframework/web/cgform/engine/jformunion.ftl
+++ b/src/main/java/org/jeecgframework/web/cgform/engine/jformunion.ftl
@@ -76,11 +76,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/boostrap01/html/autolist.ftl b/src/main/resources/online/template/boostrap01/html/autolist.ftl
index e8aa20b9..ada7d56d 100644
--- a/src/main/resources/online/template/boostrap01/html/autolist.ftl
+++ b/src/main/resources/online/template/boostrap01/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/boostrap01/html/jform.ftl b/src/main/resources/online/template/boostrap01/html/jform.ftl
index f74d8801..8f4610d7 100644
--- a/src/main/resources/online/template/boostrap01/html/jform.ftl
+++ b/src/main/resources/online/template/boostrap01/html/jform.ftl
@@ -70,11 +70,9 @@
     }
     function uploadFile(data){
         if(!$("input[name='id']").val()){
-            <!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
             if(data.obj!=null && data.obj!='undefined'){
                 $("input[name='id']").val(data.obj.id);
             }
-            <!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
         }
         if($(".uploadify-queue-item").length>0){
             upload();
diff --git a/src/main/resources/online/template/default/html/autolist.ftl b/src/main/resources/online/template/default/html/autolist.ftl
index d50a712f..8ba7ec37 100644
--- a/src/main/resources/online/template/default/html/autolist.ftl
+++ b/src/main/resources/online/template/default/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/default/html/jform.ftl b/src/main/resources/online/template/default/html/jform.ftl
index 5a5a1b29..a35dba9d 100644
--- a/src/main/resources/online/template/default/html/jform.ftl
+++ b/src/main/resources/online/template/default/html/jform.ftl
@@ -29,7 +29,6 @@
 						</label>
 					</td>
 					<td class="value">
-						<!--update-begin--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
 							<!--如果为树形菜单，父id输入框设置为select-->
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@@ -73,7 +72,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							       style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -702,11 +700,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/default/html/jformunion.ftl b/src/main/resources/online/template/default/html/jformunion.ftl
index 2e02d9e6..05d5a963 100644
--- a/src/main/resources/online/template/default/html/jformunion.ftl
+++ b/src/main/resources/online/template/default/html/jformunion.ftl
@@ -76,11 +76,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/default2/html/autolist.ftl b/src/main/resources/online/template/default2/html/autolist.ftl
index d50a712f..8ba7ec37 100644
--- a/src/main/resources/online/template/default2/html/autolist.ftl
+++ b/src/main/resources/online/template/default2/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/default2/html/jform.ftl b/src/main/resources/online/template/default2/html/jform.ftl
index 720396c5..3f5f1842 100644
--- a/src/main/resources/online/template/default2/html/jform.ftl
+++ b/src/main/resources/online/template/default2/html/jform.ftl
@@ -29,7 +29,6 @@
 						</label>
 					</td>
 					<td class="value">
-						<!--update-begin--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
 							<!--如果为树形菜单，父id输入框设置为select-->
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@@ -73,7 +72,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							       style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -405,11 +403,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/default2/html/jformunion.ftl b/src/main/resources/online/template/default2/html/jformunion.ftl
index 2e02d9e6..05d5a963 100644
--- a/src/main/resources/online/template/default2/html/jformunion.ftl
+++ b/src/main/resources/online/template/default2/html/jformunion.ftl
@@ -76,11 +76,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/ledefault/html/autolist.ftl b/src/main/resources/online/template/ledefault/html/autolist.ftl
index d50a712f..8ba7ec37 100644
--- a/src/main/resources/online/template/ledefault/html/autolist.ftl
+++ b/src/main/resources/online/template/ledefault/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/ledefault/html/jform.ftl b/src/main/resources/online/template/ledefault/html/jform.ftl
index 2635a76a..3f91cb38 100644
--- a/src/main/resources/online/template/ledefault/html/jform.ftl
+++ b/src/main/resources/online/template/ledefault/html/jform.ftl
@@ -127,7 +127,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -459,11 +458,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/ledefault/html/jformhead.ftl b/src/main/resources/online/template/ledefault/html/jformhead.ftl
index 65b04e8f..4a5bfd1d 100644
--- a/src/main/resources/online/template/ledefault/html/jformhead.ftl
+++ b/src/main/resources/online/template/ledefault/html/jformhead.ftl
@@ -63,7 +63,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
diff --git a/src/main/resources/online/template/ledefault/html/jformunion.ftl b/src/main/resources/online/template/ledefault/html/jformunion.ftl
index 52efe763..de04fc40 100644
--- a/src/main/resources/online/template/ledefault/html/jformunion.ftl
+++ b/src/main/resources/online/template/ledefault/html/jformunion.ftl
@@ -122,11 +122,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/ledefault2/html/autolist.ftl b/src/main/resources/online/template/ledefault2/html/autolist.ftl
index d50a712f..8ba7ec37 100644
--- a/src/main/resources/online/template/ledefault2/html/autolist.ftl
+++ b/src/main/resources/online/template/ledefault2/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/ledefault2/html/jform.ftl b/src/main/resources/online/template/ledefault2/html/jform.ftl
index 965f7c5b..14f4ec7d 100644
--- a/src/main/resources/online/template/ledefault2/html/jform.ftl
+++ b/src/main/resources/online/template/ledefault2/html/jform.ftl
@@ -109,7 +109,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -441,11 +440,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/ledefault2/html/jformhead.ftl b/src/main/resources/online/template/ledefault2/html/jformhead.ftl
index 65b04e8f..4a5bfd1d 100644
--- a/src/main/resources/online/template/ledefault2/html/jformhead.ftl
+++ b/src/main/resources/online/template/ledefault2/html/jformhead.ftl
@@ -63,7 +63,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
diff --git a/src/main/resources/online/template/ledefault2/html/jformunion.ftl b/src/main/resources/online/template/ledefault2/html/jformunion.ftl
index 52efe763..de04fc40 100644
--- a/src/main/resources/online/template/ledefault2/html/jformunion.ftl
+++ b/src/main/resources/online/template/ledefault2/html/jformunion.ftl
@@ -122,11 +122,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/moblieCommon001/html/autolist.ftl b/src/main/resources/online/template/moblieCommon001/html/autolist.ftl
index fc102f51..1a7c67e4 100644
--- a/src/main/resources/online/template/moblieCommon001/html/autolist.ftl
+++ b/src/main/resources/online/template/moblieCommon001/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/moblieCommon002/html/autolist.ftl b/src/main/resources/online/template/moblieCommon002/html/autolist.ftl
index fc102f51..1a7c67e4 100644
--- a/src/main/resources/online/template/moblieCommon002/html/autolist.ftl
+++ b/src/main/resources/online/template/moblieCommon002/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/nopopform/html/autolist.ftl b/src/main/resources/online/template/nopopform/html/autolist.ftl
index 7c523e0f..9259d9a1 100644
--- a/src/main/resources/online/template/nopopform/html/autolist.ftl
+++ b/src/main/resources/online/template/nopopform/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/nopopform/html/jform.ftl b/src/main/resources/online/template/nopopform/html/jform.ftl
index 661a0511..f893eb0a 100644
--- a/src/main/resources/online/template/nopopform/html/jform.ftl
+++ b/src/main/resources/online/template/nopopform/html/jform.ftl
@@ -37,7 +37,6 @@
 						</label>
 					</td>
 					<td class="value">
-						<!--update-begin--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
 							<!--如果为树形菜单，父id输入框设置为select-->
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@@ -81,7 +80,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							       style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
diff --git a/src/main/resources/online/template/o2mTableStyle/html/autolist.ftl b/src/main/resources/online/template/o2mTableStyle/html/autolist.ftl
index d50a712f..8ba7ec37 100644
--- a/src/main/resources/online/template/o2mTableStyle/html/autolist.ftl
+++ b/src/main/resources/online/template/o2mTableStyle/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/o2mTableStyle/html/jform.ftl b/src/main/resources/online/template/o2mTableStyle/html/jform.ftl
index 076046a3..4134729c 100644
--- a/src/main/resources/online/template/o2mTableStyle/html/jform.ftl
+++ b/src/main/resources/online/template/o2mTableStyle/html/jform.ftl
@@ -89,7 +89,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -422,11 +421,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/o2mTableStyle/html/jformhead.ftl b/src/main/resources/online/template/o2mTableStyle/html/jformhead.ftl
index ed5d3d54..972b67d2 100644
--- a/src/main/resources/online/template/o2mTableStyle/html/jformhead.ftl
+++ b/src/main/resources/online/template/o2mTableStyle/html/jformhead.ftl
@@ -59,7 +59,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
diff --git a/src/main/resources/online/template/olstyle00002/html/autolist.ftl b/src/main/resources/online/template/olstyle00002/html/autolist.ftl
index 14ba47e5..eac18850 100644
--- a/src/main/resources/online/template/olstyle00002/html/autolist.ftl
+++ b/src/main/resources/online/template/olstyle00002/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/rowsEdit/html/autolist.ftl b/src/main/resources/online/template/rowsEdit/html/autolist.ftl
index e97d46ee..e99ee9d7 100644
--- a/src/main/resources/online/template/rowsEdit/html/autolist.ftl
+++ b/src/main/resources/online/template/rowsEdit/html/autolist.ftl
@@ -1,6 +1,4 @@
 ${config_iframe}
-
-<!--update-start--Author:luobaoli  Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
 <script type="text/javascript">
 /**
 *表单的高度,表单的宽度
diff --git a/src/main/resources/online/template/rowsEdit/html/jform.ftl b/src/main/resources/online/template/rowsEdit/html/jform.ftl
index 107d94ff..a4fa7ac5 100644
--- a/src/main/resources/online/template/rowsEdit/html/jform.ftl
+++ b/src/main/resources/online/template/rowsEdit/html/jform.ftl
@@ -109,7 +109,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@@ -441,11 +440,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/resources/online/template/rowsEdit/html/jformhead.ftl b/src/main/resources/online/template/rowsEdit/html/jformhead.ftl
index 65b04e8f..4a5bfd1d 100644
--- a/src/main/resources/online/template/rowsEdit/html/jformhead.ftl
+++ b/src/main/resources/online/template/rowsEdit/html/jformhead.ftl
@@ -63,7 +63,6 @@
 				                    	}
 				                    }
 				            ">
-				        <!--update-end--Author:钟世云  Date:20150610 for：online支持树配置-->
 						<#elseif po.show_type=='text'>
 							<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
 							        class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
diff --git a/src/main/resources/online/template/rowsEdit/html/jformunion.ftl b/src/main/resources/online/template/rowsEdit/html/jformunion.ftl
index 52efe763..de04fc40 100644
--- a/src/main/resources/online/template/rowsEdit/html/jformunion.ftl
+++ b/src/main/resources/online/template/rowsEdit/html/jformunion.ftl
@@ -122,11 +122,9 @@
   }
   function uploadFile(data){
   		if(!$("input[name='id']").val()){
-  			<!--update-start--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   			if(data.obj!=null && data.obj!='undefined'){
   				$("input[name='id']").val(data.obj.id);
   			}
-  			<!--update-end--Author:luobaoli  Date:20150614 for：需要判断data.obj存在，才能取id值-->
   		}
   		if($(".uploadify-queue-item").length>0){
   			upload();
diff --git a/src/main/webapp/init.jsp b/src/main/webapp/init.jsp
index d8b05747..ddd20645 100644
--- a/src/main/webapp/init.jsp
+++ b/src/main/webapp/init.jsp
@@ -4,7 +4,6 @@
 <html>
 <body>
 数据库初始化中.....
-<%--update-begin--Author:zhangguoming  Date:20140609 for：云桌面，清除桌面图标的cookie历史记录--%>
 <script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.min.js"></script>
 <script  type="text/javascript" src="plug-in/sliding/js/jquery.cookie.js"></script>
 <script type="text/javascript">
@@ -13,7 +12,6 @@
     $.cookie(iconCookieKey, null);
     $.cookie(iconCookieKeyForSlider, null);
 </script>
-<%--update-end--Author:zhangguoming  Date:20140609 for：云桌面，清除桌面图标的cookie历史记录--%>
 <script type="text/javascript">
     window.setTimeout(function() {
         window.location.replace('repairController.do?repair');
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 bed9120d..0b6a6fe4 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
@@ -337,7 +337,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -354,7 +353,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
     var gChecked = 'orgchecked0';
     if ($G('orgchecked1').checked) gChecked = 'orgchecked1';
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 75a458ab..0625d8ce 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
@@ -377,7 +377,6 @@ if( UE.plugins[thePlugins].editdom ) {
 }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#tbl1').children().eq(0).children().eq(3).children().find("option:selected");
         var flag=false;
@@ -394,7 +393,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
 	 var gName=$G('orgname').value.replace(/\"/g,"&quot;"),gWidth=$G('orgwidth').value;
 	
     if( gName == '') {
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/popup.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/popup.html
index 10fd7f0e..5d99867c 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/popup.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/popup.html
@@ -48,7 +48,6 @@ function createElement(type, name)
         <th><span>字段</span> </th>
     </tr>
     <tr>
-        <!--update-begin--Author:zzl  Date:20151105 for：数据源及字段可选 -->
 
         <td>
             <select id="datasource"></select>
@@ -58,7 +57,6 @@ function createElement(type, name)
                 <option selected value=''>请先选择数据源</option>
             </select>
         </td>
-        <!--update-end--Author:zzl  Date:20151105 for：数据源及字段可选 -->
     </tr>
     <tr>
         <th ><span >PopUp报表</span></th>
@@ -143,7 +141,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -160,17 +157,14 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     var datasource=$('#datasource').val();
     var field=$('#field').val();
-    <!--update-begin--Author:zzl  Date:20151105 for：数据源及字段可选 -->
     var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
     if(datasource !='' && field ==''){
         alert('请选择字段');
         return false;
     }
     var name= getName(datasource,field,gTitle);
-    <!--update-end--Author:zzl  Date:20151105 for：数据源及字段可选 -->
     var gSize = $G('orgsize').value ;
     if ( gSize == null || isNaN( gSize ) || gSize < 1 ) {
         gSize = '' ;
@@ -248,7 +242,6 @@ function getName(datasource,field,title){
         return title;
     }
 }
-<!--update-begin--Author:zzl  Date:20151105 for：数据源及字段可选 -->
 $(function(){
     var id = '';
     editor.ready(function() {
@@ -279,7 +272,6 @@ $(function(){
     });
 
 });
-<!--update-end--Author:zzl  Date:20151105 for：数据源及字段可选 -->
 function loadDataType(val){
     $("#datatype").empty();
     $("#datatype").append("<option value=''>无</option>");
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radio.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radio.html
index 183b0e47..6ef094a9 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radio.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radio.html
@@ -246,7 +246,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -263,7 +262,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if( oListText.options.length == 0 ) {
         alert('请添加选项！');
         return false;
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html
index 18aeea4c..721e073e 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html
@@ -345,7 +345,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -362,7 +361,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
  	var datasource=$G('datasource').value;
     var field=$G('field').value;
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html
index b23708be..09312b9b 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html
@@ -355,7 +355,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -372,7 +371,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if( oListText.options.length == 0 ) {
         alert('请添加下拉菜单选项！');
         return false;
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html
index 3a1ec156..7a8132fa 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html
@@ -178,7 +178,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -195,7 +194,6 @@ dialog.onok = function (){
             return false;
         }
     }
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gAlign=$G('orgalign').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value,gType=$G('orgtype').value;
     var datasource=$('#datasource').val();
     var field=$('#field').val();
diff --git a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html
index 18316515..118ad1de 100644
--- a/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html
+++ b/src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html
@@ -32,7 +32,6 @@
         <th><span>字段</span> </th>
     </tr>
     <tr>
-        <!--update-begin--Author:zzl  Date:20151106 for：数据源及字段可选 -->
 
         <td>
             <select id="datasource"></select>
@@ -42,7 +41,6 @@
                 <option selected value=''>请先选择数据源</option>
             </select>
         </td>
-        <!--update-end--Author:zzl  Date:20151106 for：数据源及字段可选 -->
     </tr>
     <tr>
         <th><span>输入框样式</span> </th>
@@ -130,7 +128,6 @@ dialog.oncancel = function () {
     }
 };
 dialog.onok = function (){
-    <!--update-begin--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     if($G('orgname').value==''){
         var selectedField=$('#field').find("option:selected");
         var flag=false;
@@ -148,17 +145,14 @@ dialog.onok = function (){
         }
     }
     var datatype = $G('datatype').value;
-    <!--update-end--Author:zzl  Date:20151108 for：控件名称为空时优先使用字段名称 -->
     var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value;
     var datasource=$G('datasource').value;
     var field=$G('field').value;
-    <!--update-begin--Author:zzl  Date:20151106 for：数据源及字段可选 -->
     if(datasource !='' && field ==''){
         alert('请选择字段');
         return false;
     }
     var name= getName(datasource,field,gTitle);
-    <!--update-end--Author:zzl  Date:20151106 for：数据源及字段可选 -->
     if( !oNode ) {
         try {
             var html = '<textarea ';
@@ -258,7 +252,6 @@ function getName(datasource,field,title){
         return title;
     }
 }
-<!--update-begin--Author:zzl  Date:20151106 for：数据源及字段可选 -->
 $(function(){
     var id = '';
     editor.ready(function() {
@@ -290,7 +283,6 @@ $(function(){
 
 
 });
-<!--update-end--Author:zzl  Date:20151106 for：数据源及字段可选 -->
 function loadDataType(val){
     $("#datatype").empty();
     $("#datatype").append("<option value=''>无</option>");
diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-add.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-add.jsp
index c5fe6811..e7539851 100644
--- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-add.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-add.jsp
@@ -30,7 +30,6 @@
 		  hideDataSourceAndDataTable();
 	  });
   });
-  <!--update-begin--Author:zzl  Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
   function hideDataSourceAndDataTable(){
 	  var checkedVal=$("input[name='dbType']:checked").val();
 	  if(checkedVal=='table'){
@@ -39,8 +38,6 @@
 		  $("#dataSourceTr").show();
 	  }
   }
-  <!--update-end--Author:zzl  Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
-  <!--update-begin--Author:zzl  Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
   function setDataSourceVal(){
 	  var checkedVal=$("input[name='dbType']:checked").val();
 	  if(checkedVal=='table'){
@@ -48,7 +45,6 @@
 		  $("#tbDbTableName").val($("#dbTableName").find("option:selected").val());
 	  }
   }
-  <!--update-end--Author:zzl  Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
 
   /*每次只能提交一种数据类型的数据，不能同时提交
   function onlySubmit(){
@@ -80,14 +76,9 @@
 					<label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label>
 				</td>
 				<td class="value" >
-					 <!--update-begin--Author:luobaoli  Date:20150626 for：增加数据源名称的非空校验 -->
-					 <!--update-begin--Author:jg_renjie  Date:20150720 for：增加数据源名称的唯一性校验 -->
 			     	 <input id="dbName" name="dbName" type="text" style="width: 150px"   ajaxurl="autoFormDbController.do?checkDbName"  class="inputxt" errorMsg="不能为中文" nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!"  datatype="/^[A-Za-z\d-._]+$/"  >
-			     	 <!--update-end--Author:jg_renjie  Date:20150720 for：增加数据源名称的唯一性校验 -->
-			     	 <!--update-end--Author:luobaoli  Date:20150626 for：增加数据源名称的非空校验 -->	
 					<span class="Validform_checktip"></span>
 				</td>
-				<!--update-begin--Author:zzl  Date:20151028 for：增加数据源名称 -->
 				<td align="center" width="100px">
 					<label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label>
 				</td>
@@ -95,7 +86,6 @@
 					<input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!"  >
 					<span class="Validform_checktip"></span>
 				</td>
-				<!--update-end--Author:zzl  Date:20151028 for：增加数据源名称 -->
 			</tr>
 			<!-- 
 			<tr>
@@ -139,7 +129,6 @@
 				</td>
 				<!--add-end--Author:gengjiajia  Date:20160616 for：#1110  添加动态数据源 -->
 			</tr>
-			<!--update-begin--Author: jg_huangxg  Date:20150723 for：增加填报数据源和填报数据库表显示 -->
 			<tr id="dataSourceTr">
 				<td align="center">
 					<label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label>
@@ -168,9 +157,7 @@
 				<td class="value">
 				</td>
 			</tr>
-			<!--update-end--Author: jg_huangxg  Date:20150723 for：增加填报数据源和填报数据库表显示 -->
 		</table>
-		<!--add-begin--Author:luobaoli  Date:20150621 for：新增数据源类型为“table”时的处理逻辑 -->	
 		<div style="margin-top: 20px;border: 1px solid #E6E6E6;display: none" id="table_div" class="formdbdiv">
 			<table cellpadding="0" cellspacing="1" class="formtable">
 				<tr>
@@ -179,12 +166,10 @@
 					</td>
 					<td class="value">
 						<select id="dbKey" name="dbKey">
-							<!--update-begin--Author:luobaoli  Date:20150701 for：表单数据源新增时增加数据源显示逻辑 -->
 							<option value="">平台数据源</option>
 							<c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity">
 								<option value="${dynamicDataSourceEntity.dbKey}">${dynamicDataSourceEntity.dbKey}</option>
 							</c:forEach>
-							<!--update-end--Author:luobaoli  Date:20150701 for：表单数据源新增时增加数据源显示逻辑 -->
 						</select>
 						<span class="Validform_checktip"></span>
 					</td>
@@ -193,11 +178,9 @@
 					</td>
 					<td class="value">
 				     	 <select id="dbTableName" name="dbTableName">
-				     	 	<!--update-begin--Author:luobaoli  Date:20150701 for：增加初始化数据表显示 -->
 				     	 	<c:forEach items="${tableNames}" var="tableName">
 				     	 		<option value="${tableName}">${tableName}</option>
 				     	 	</c:forEach>
-				     	 	<!--update-end--Author:luobaoli  Date:20150701 for：增加初始化数据表显示 -->
 				     	 </select>
 				     	 <span class="Validform_checktip"></span>
 					</td>
@@ -234,22 +217,18 @@
 				</tr>
 				<tr>
 					<td class="value" colspan="4">
-						<!--update-begin--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 						<fieldset style="border: 1px solid #E6E6E6;">
 							<legend><t:mutiLang langKey="form.db.query.param"/></legend>
 							<div style="width:100%;height:100%" title="form.db.query.param" id="autoFormParam"></div>
 						</fieldset>
-						<!--update-end--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 					</td>
 				</tr>
 				<tr>
 					<td class="value" colspan="4">
-						<!--update-begin--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 						<fieldset style="border: 1px solid #E6E6E6;">
 							<legend><t:mutiLang langKey="form.db.query.data.column"/></legend>
 							<div style="width:100%;height:100%" title="form.db.query.data.column" id="autoFormDbField"></div>
 						</fieldset>
-						<!--update-end--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 					</td>
 				</tr>
 			</table>
@@ -314,7 +293,6 @@
 				</td>
 		</tr>
 	 </tbody>
-	 <!--add-begin--Author:luobaoli  Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->	
 	 <tbody id="add_autoFormDbFieldForTable_table_template">
 		<tr>
 			 <td align="center"><div style="width: 40px;" name="xh"></div></td>
@@ -332,7 +310,6 @@
 					</td>
 			</tr>
 		 </tbody>
-	<!--add-begin--Author:luobaoli  Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->	
 	</table>
  </body>
  <script src = "webpage/jeecg/cgform/autoform/autoFormDb.js"></script>	
\ No newline at end of file
diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-update.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-update.jsp
index 187b90cd..30bb76a3 100644
--- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-update.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-update.jsp
@@ -60,7 +60,6 @@
 
 	  hideDataSourceAndDataTable();
   });
-  <!--update-begin--Author:zzl  Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
   function hideDataSourceAndDataTable(){
 	  var checkedVal=$("input[name='dbType']:checked").val();
 	  if(checkedVal=='table'){
@@ -69,8 +68,6 @@
 		  $("#dataSourceTr").show();
 	  }
   }
-  <!--update-end--Author:zzl  Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
-  <!--update-begin--Author:zzl  Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
   function setDataSourceVal(){
 	  var checkedVal=$("input[name='dbType']:checked").val();
 	  if(checkedVal=='table'){
@@ -78,7 +75,6 @@
 		  $("#tbDbTableName").val($("#dbTableName").find("option:selected").val());
 	  }
   }
-  <!--update-end--Author:zzl  Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
  </script>
  </head>
  <body style="overflow-x: hidden;">
@@ -100,14 +96,9 @@
 				<label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label>
 			</td>
 			<td class="value" >
-				 <!--update-begin--Author:luobaoli  Date:20150626 for：增加数据源名称的非空校验 -->
-				 <!--update-begin--Author:jg_renjie  Date:20150720 for：增加数据源名称的唯一性校验 -->
 		     	 <input id="dbName" name="dbName" type="text" style="width: 150px"  ajaxurl="autoFormDbController.do?checkDbName&cVal=${autoFormDbPage.dbName}"  class="inputxt" value='${autoFormDbPage.dbName}' nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!" errorMsg="不能为中文"  datatype="/^[A-Za-z\d-._]+$/" >
-		     	 <!--update-end--Author:jg_renjie  Date:20150720 for：增加数据源名称的唯一性校验 -->
-		     	 <!--update-end--Author:luobaoli  Date:20150626 for：增加数据源名称的非空校验 -->
 				<span class="Validform_checktip"></span>
 			</td>
-			<!--update-begin--Author:zzl  Date:20151028 for：增加数据源名称 -->
 			<td align="center" width="100px">
 				<label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label>
 			</td>
@@ -115,7 +106,6 @@
 				<input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!" value='${autoFormDbPage.dbChName}'  />
 				<span class="Validform_checktip"></span>
 			</td>
-			<!--update-end--Author:zzl  Date:20151028 for：增加数据源名称 -->
 		</tr>
 		<!-- 
 		<tr>
@@ -159,7 +149,6 @@
 				</td>
 			<!--add-end--Author:gengjiajia  Date:20160616 for：#1110  添加动态数据源 -->
 		</tr>
-		<!--update-begin--Author: jg_huangxg  Date:20150723 for：增加填报数据源和填报数据库表显示 -->
 		<tr id="dataSourceTr">
 			<td align="right">
 				<label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label>
@@ -188,10 +177,8 @@
 			<td class="value">
 			</td>
 		</tr>
-		<!--update-end--Author: jg_huangxg  Date:20150723 for：增加填报数据源和填报数据库表显示 -->
 		</tr>
 			</table>
-			<!--add-begin--Author:luobaoli  Date:20150621 for：新增数据源类型为“table”时的处理逻辑 -->	
 			<c:if test="${autoFormDbPage.dbType == 'table'}">
 				<div style="margin-top: 5px;border: 1px solid #E6E6E6;" id="table_div" class="formdbdiv">
 					<table cellpadding="0" cellspacing="1" class="formtable">
@@ -201,12 +188,10 @@
 							</td>
 							<td class="value">
 								<select id="dbKey" name="dbKey">
-									<!--update-begin--Author:luobaoli  Date:20150701 for：表单数据源编辑时增加数据源正确显示逻辑 -->
 									<option value="" <c:if test='${empty autoFormDbPage.dbKey}'>selected="selected"</c:if>>平台数据源</option>
 									<c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity">
 										<option value="${dynamicDataSourceEntity.dbKey}" <c:if test='${autoFormDbPage.dbKey==dynamicDataSourceEntity.dbKey}'>selected="selected"</c:if>>${dynamicDataSourceEntity.dbKey}</option>
 									</c:forEach>
-									<!--update-end--Author:luobaoli  Date:20150701 for：表单数据源编辑时增加数据源正确显示逻辑 -->
 								</select>
 								<span class="Validform_checktip"></span>
 							</td>
@@ -255,22 +240,18 @@
 					</tr>
 					<tr>
 						<td class="value" colspan="4">
-							<!--update-begin--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 							<fieldset style="border: 1px solid #E6E6E6;">
 								<legend>查询参数</legend>
 								<div style="width:100%;height:100%" title="表单参数" id="autoFormParam"></div>
 							</fieldset>
-							<!--update-end--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 						</td>
 					</tr>
 					<tr>
 						<td class="value" colspan="4">
-							<!--update-begin--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 							<fieldset style="border: 1px solid #E6E6E6;">
 								<legend>查询数据列</legend>
 								<div style="width:100%;height:100%" title="表单数据源属性" id="autoFormDbField"></div>
 							</fieldset>
-							<!--update-end--Author:luobaoli  Date:20150630 for：新增fieldset标签 -->	
 						</td>
 					</tr>
 				</table>
@@ -339,7 +320,6 @@
 				</td>
 			</tr>
 		 </tbody>
-		 <!--add-begin--Author:luobaoli  Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->
 		 <tbody id="add_autoFormDbFieldForTable_table_template">
 		<tr>
 			 <td align="center"><div style="width: 40px;" name="xh"></div></td>
diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbFieldList.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbFieldList.jsp
index 2ce50e56..8f9e4877 100644
--- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbFieldList.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbFieldList.jsp
@@ -35,7 +35,6 @@
 	<a id="addAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a> 
 </div>
 <table border="0" cellpadding="2" cellspacing="0" id="autoFormDbField_table">
-	<!--update-begin--Author:luobaoli  Date:20150621 for：将表头列宽设置为固定值-->
 	<tr bgcolor="#E6E6E6">
 		<td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td>
 		<td align="center" width="40px" bgcolor="#EEEEEE">选择</td>
@@ -43,7 +42,6 @@
 		<td align="left" width="120px" bgcolor="#EEEEEE"><t:mutiLang langKey="form.field.content"/></td>
 	  	<td align="center" width="50px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.operation"/></td>
 	</tr>
-	<!--update-end--Author:luobaoli  Date:20150621 for：将表头列宽设置为固定值-->
 	<tbody id="add_autoFormDbField_table">
 	<!-- 
 	<c:if test="${fn:length(autoFormDbFieldList)  <= 0 }">
diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbList.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbList.jsp
index e91eb752..9900c705 100644
--- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbList.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbList.jsp
@@ -9,17 +9,13 @@
    <t:dgCol title="common.createby"  field="createBy"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
    <t:dgCol title="common.updateName"  field="updateName"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
    <t:dgCol title="common.updateBy"  field="updateBy"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
-   <!--update-end--Author:luobaoli  Date:20150617 for：调整国际化编码-->
    <t:dgCol title="common.depart.code"  field="sysOrgCode"  hidden="true"  queryMode="single" dictionary="t_s_depart,id,departname"  width="120"></t:dgCol>
-   <!--update-end--Author:luobaoli  Date:20150617 for：调整国际化编码-->
    <t:dgCol title="common.company.code"  field="sysCompanyCode"  hidden="true"  queryMode="single" dictionary="t_s_depart,id,departname"  width="120"></t:dgCol>
    <t:dgCol title="common.createDate"  field="createDate" formatter="yyyy-MM-dd" hidden="true"  queryMode="single"  width="120"></t:dgCol>
    <t:dgCol title="common.updateDate"  field="updateDate" formatter="yyyy-MM-dd" hidden="true"  queryMode="single"  width="120"></t:dgCol>
    <t:dgCol title="form.db.name"  field="dbName"    queryMode="single"  width="120"></t:dgCol>
    <t:dgCol title="form.db.chname"  field="dbChName"    queryMode="single"  width="120"></t:dgCol>
-   <!--update-end--Author:luobaoli  Date:20150701 for：显示中文数据源类型-->
    <t:dgCol title="form.db.type"  field="dbType"    queryMode="single" dictionary="formDbType" width="120"></t:dgCol>
-   <!--update-end--Author:luobaoli  Date:20150701 for：显示中文数据源类型-->
    <t:dgCol title="form.db.tablename"  field="dbTableName"    queryMode="single"  width="120"></t:dgCol>
    <!--add-start--Author: jg_huangxg  Date:20150723 for：新增填报数据源和填报数据库表显示-->
    <t:dgCol title="form.tb.db.key"  field="tbDbKey"    queryMode="single"  width="120"></t:dgCol>
diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormParamList.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormParamList.jsp
index 7151c4e2..6d5c99a7 100644
--- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormParamList.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoFormParamList.jsp
@@ -44,7 +44,6 @@
 	<a id="addAutoFormParamBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormParamBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a> 
 </div>
 <table border="0" cellpadding="2" cellspacing="0" id="autoFormParam_table">
-	<!--update-begin--Author:luobaoli  Date:20150621 for：将表头列宽设置为固定值-->
 	<tr bgcolor="#E6E6E6">
 		<td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td>
 		<td align="center" width="40px" bgcolor="#EEEEEE">选择</td>
@@ -64,7 +63,6 @@
 				  		<t:mutiLang langKey="common.operation"/>
 				  </td>
 	</tr>
-	<!--update-end--Author:luobaoli  Date:20150621 for：将表头列宽设置为固定值-->
 	<tbody id="add_autoFormParam_table">
 	<!-- 
 	<c:if test="${fn:length(autoFormParamList)  <= 0 }">
diff --git a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp
index dd4c64f8..6110ccc9 100644
--- a/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp
@@ -25,9 +25,7 @@
 </script>
 <!--add-end--Author:luobaoli  Date:20150607 for：增加表单树型列表-->
 <div class="easyui-layout" fit="true">
-<!--update-start--Author:luobaoli  Date:20150609 for：panel调整为默认关闭-->
 <div region="west" style="width: 150px;" title="表单分类" split="true" collapsed="true">
-<!--update-end--Author:luobaoli  Date:20150609 for：panel调整为默认关闭-->
 <div class="easyui-panel" style="padding:0px;border:0px" fit="true" border="false">
 <ul id="formtree">
 </ul>
@@ -67,7 +65,6 @@
 	<t:dgToolBar title="custom.button" icon="icon-edit" url="cgformButtonController.do?cgformButton" funname="cgFormButton"></t:dgToolBar>
 	<t:dgToolBar title="js.enhance" icon="icon-edit" url="cgformEnhanceJsController.do?addorupdate" funname="enhanceJs"></t:dgToolBar>
 	<t:dgToolBar title="sql.enhance" icon="icon-edit" url="cgformButtonSqlController.do?addorupdate" funname="cgFormButtonSql"></t:dgToolBar>
-	<!--add-begin--Author:luobaoli  Date:20150630 for：新增java增强按钮 -->
 	<t:dgToolBar title="java.enhance" icon="icon-edit" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar>
 	<!--add-end--Author:luobaoli  Date:20150630 for：新增java增强按钮 -->
 	<t:dgToolBar title="form.export" icon="icon-putout" url="cgformSqlController.do?doMigrateOut" funname="doMigrateOut"></t:dgToolBar>
@@ -325,7 +322,6 @@
 	function toCgformMigrate(){
 		openuploadwin('<t:mutiLang langKey="form.sqlimport"/>', 'cgformSqlController.do?toCgformMigrate', "tablePropertyList");
 	}
-    <%--   update-end--Author:duanqilu  Date:20130910 for#211 升级SQL导入导出--%>	
 	//代码生成
 	function generate(title,url,id){
 		var rowsData = $('#'+id).datagrid('getSelections');
diff --git a/src/main/webapp/webpage/jeecg/cgform/enhance/cgformEnhanceJava.jsp b/src/main/webapp/webpage/jeecg/cgform/enhance/cgformEnhanceJava.jsp
index 66c220b3..a0e52246 100644
--- a/src/main/webapp/webpage/jeecg/cgform/enhance/cgformEnhanceJava.jsp
+++ b/src/main/webapp/webpage/jeecg/cgform/enhance/cgformEnhanceJava.jsp
@@ -28,9 +28,7 @@
 		</tr>
 		<tr>
 			<td align="center" width="150px"><label class="Validform_label"> <t:mutiLang langKey="common.value"/>: </label></td>
-			<!--update-end--Author:luobaoli  Date:20150701 for：取消非空校验-->
 			<td class="value"><input id="cgJavaValue" name="cgJavaValue" style="width: 200px;height: 20px" value="${cgformEnhanceJavaPage.cgJavaValue}"/><span class="Validform_checktip"></span></td>
-			<!--update-end--Author:luobaoli  Date:20150701 for：取消非空校验-->
 		</tr>
 	</table>
 </t:formvalid>
diff --git a/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-add.jsp b/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-add.jsp
index e69ff29a..fc21de2d 100644
--- a/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-add.jsp
+++ b/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-add.jsp
@@ -113,7 +113,6 @@
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td>
 			<td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*"></textarea> <span class="Validform_checktip"></span></td>
 		</tr>
-		<!--update-begin--Author:huangzq  Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-->
 		<tr>
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td>
 			<td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt"> <span class="Validform_checktip"></span></td>
@@ -122,7 +121,6 @@
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td>
 			<td class="value" colspan="2"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="1" /><span class="Validform_checktip"></span></td>
         </tr>
-        <!--update-end--Author:huangzq  Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-->   
 	</table>
 	<div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%>
 	<div style="width: 800px; height: 1px;"></div>
diff --git a/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-update.jsp b/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-update.jsp
index b6c812b5..335c1cfe 100644
--- a/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-update.jsp
+++ b/src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-update.jsp
@@ -111,7 +111,6 @@
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td>
 			<td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*">${cgreportConfigHeadPage.content}</textarea> <span class="Validform_checktip"></span></td>
 		</tr>
-	<!-- 		update-begin--Author:huangzq  Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-------------------- -->
 		<tr>
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td>
 			<td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt" value="${cgreportConfigHeadPage.returnValField}"> <span class="Validform_checktip"></span></td>
@@ -120,7 +119,6 @@
 			<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td>
 			<td class="value" colspan="3"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="${cgreportConfigHeadPage.popRetype}"/><span class="Validform_checktip"></span></td>
         </tr>
-     <!-- 		update-end--Author:huangzq  Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-------------------- -->   
 	</table>
 	<div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%>
 		<div style="width: 800px; height: 1px;"></div>
diff --git a/src/main/webapp/webpage/jeecg/demo/base/AJAX/select.jsp b/src/main/webapp/webpage/jeecg/demo/base/AJAX/select.jsp
index 479eaf0e..54c1c3b2 100644
--- a/src/main/webapp/webpage/jeecg/demo/base/AJAX/select.jsp
+++ b/src/main/webapp/webpage/jeecg/demo/base/AJAX/select.jsp
@@ -53,7 +53,6 @@
 		</tr>
 	</table>
 </t:formvalid>
-<!--update-begin--Author:huangzq  Date:20151127 for：三级联调 -->
 <script type="text/javascript">
 	var province_city_county_data=[ 	
 	{
diff --git a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp
index c93becfa..1227d86c 100644
--- a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp
+++ b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp
@@ -20,8 +20,6 @@
 <div region="center"  style="padding:0px;border:0px">
 <t:datagrid name="jeecgDemoList" title="DEMO示例列表" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid"  fitColumns="true"
 	idField="id" fit="true" queryMode="group" checkbox="true" queryBuilder="true">
-	<%--   update-end--Author:tanghan  Date:20130713 for添加checkbox--%>
-	<%--update-begin--Author:fangwenrong  Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
 	<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
 	<t:dgCol title="用户名" field="userName" query="true" frozenColumn="true" extend="{style:{width:'300px';color:'red'};datatype:'*';}" width="120"></t:dgCol>
 	<t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true"  width="120"></t:dgCol>
diff --git a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList2.jsp b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList2.jsp
index a97d51ce..a1785147 100644
--- a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList2.jsp
+++ b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList2.jsp
@@ -5,8 +5,6 @@
 <div region="center"  style="padding:0px;border:0px">
 <t:datagrid name="jeecgDemoList2" title="DEMO查询默认值" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid2&status=${status}" sortName="userName"
 	idField="id" fit="true" queryMode="group" checkbox="true">
-	<%--   update-end--Author:tanghan  Date:20130713 for添加checkbox--%>
-	<%--update-begin--Author:fangwenrong  Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
 	<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
 	<t:dgCol title="用户名" field="userName" query="true" frozenColumn="true"  width="120"></t:dgCol>
 	<t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true"  width="120"></t:dgCol>
@@ -19,7 +17,6 @@
 	<t:dgCol title="性别" sortable="true" field="sex" dictionary="sex" query="true" width="60"></t:dgCol>
 	<t:dgCol title="状态" field="status" replace="未处理_0,已处理_1" width="60" query="true"></t:dgCol>
 	<t:dgCol title="操作" field="opt" width="150"></t:dgCol>
-	<%--update-end--Author:fangwenrong  Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
 <!--	<t:dgFunOpt exp="status#eq#0" operationCode="szqm" funname="szqm(id)" title="审核" />-->
 	<t:dgDelOpt operationCode="del" title="删除" url="jeecgDemoController.do?del&id={id}" />
 	<t:dgToolBar operationCode="add" title="录入" icon="icon-add" url="jeecgDemoController.do?addorupdate" funname="add"></t:dgToolBar>
diff --git a/src/main/webapp/webpage/login/login3.jsp b/src/main/webapp/webpage/login/login3.jsp
index 2039aad1..ce1924af 100644
--- a/src/main/webapp/webpage/login/login3.jsp
+++ b/src/main/webapp/webpage/login/login3.jsp
@@ -89,14 +89,12 @@ label.iPhoneCheckLabelOn span {
                     <div class="tip">
                         <input class="password" name="password" type="password" id="password" title="" value="123456" nullmsg="" />
                     </div>
-                    <%--update-begin--Author:zhangguoming  Date:20140226 for：添加验证码--%>
                     <div>
                         <div style="float: right; margin-left:-150px; margin-right: 20px;">
                             <img id="randCodeImage" src="randCodeImage" />
                         </div>
                         <input class="randCode" name="randCode" type="text" id="randCode" title="" value="" nullmsg="" />
                     </div>
-                    <%--update-end--Author:zhangguoming  Date:20140226 for：添加验证码--%>
                    
                     <div class="loginButton">
                         <div style="float: left; margin-left: -9px;">
@@ -113,10 +111,8 @@ label.iPhoneCheckLabelOn span {
                             <%-- 
                             <div style="float: left; margin-left: 30px;"><a href="init.jsp"><span class="f_help"><t:mutiLang langKey="common.init.data"/></span></a></div>
                             --%>
-                            <%--update-begin--Author:ken  Date:20140629 for：添加语言选择--%>
                             <br>                            
                             <t:dictSelect id="langCode" field="langCode" typeGroupCode="lang" hasLabel="false" defaultVal="zh-cn"></t:dictSelect>
-                            <%--update-begin--Author:ken  Date:20140629 for：添加语言选择--%>
                         </div>
                         <div class="clear"></div>
                     </div>
diff --git a/src/main/webapp/webpage/main/home.jsp b/src/main/webapp/webpage/main/home.jsp
index ffbc25f3..2fcbbd97 100644
--- a/src/main/webapp/webpage/main/home.jsp
+++ b/src/main/webapp/webpage/main/home.jsp
@@ -1,9 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <link rel="stylesheet" type="text/css" href="plug-in/accordion/css/accordion.css">
-<!-- add-begin--Author:jg_renjie  Date:20150610 for：今天需要提醒的【系统信息】 -->	
 <script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script>
-<!-- add-begin--Author:jg_renjie  Date:20150610 for：今天需要提醒的【系统信息】	 -->
 <div style="margin-top: 14px;">
 <h3>简介</h3>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;JEECG（J2EE Code Generation）是一款基于代码生成器的微云快速开发平台，引领新开发模式(智能开发\在线开发\插件开发\移动开发\流程开发)， 可以帮助解决Java项目80%的重复工作，让开发更多关注业务逻辑。既能快速提高开发效率，帮助公司节省人力成本，同时又不失灵活性。 JEECG快速开发宗旨是：简单功能由代码生成器生成使用; 复杂业务采用表单自定义，业务流程使用工作流实现、扩展出业务接口，供开发编写业务逻辑。 实现了流程任务节点和任务接口的灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量</p>
diff --git a/src/main/webapp/webpage/main/homeTab.jsp b/src/main/webapp/webpage/main/homeTab.jsp
index a6c6af07..745ef401 100644
--- a/src/main/webapp/webpage/main/homeTab.jsp
+++ b/src/main/webapp/webpage/main/homeTab.jsp
@@ -9,9 +9,7 @@
 <script type="text/javascript" src="plug-in/easyui/portal/jquery.portal.js"></script>
 <link rel="stylesheet" type="text/css" href="plug-in/easyui/portal/portal.css">
 </c:if>
-<!-- add-begin--Author:jg_renjie  Date:20150610 for：今天需要提醒的【系统信息】 -->	
 <script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script>
-<!-- add-begin--Author:jg_renjie  Date:20150610 for：今天需要提醒的【系统信息】	 -->
 
 <script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/highcharts.src.js"></script>
 <script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/modules/exporting.src.js"></script>
diff --git a/src/main/webapp/webpage/main/shortcut_main.jsp b/src/main/webapp/webpage/main/shortcut_main.jsp
index 13fb4c57..dd20d1c7 100644
--- a/src/main/webapp/webpage/main/shortcut_main.jsp
+++ b/src/main/webapp/webpage/main/shortcut_main.jsp
@@ -232,12 +232,10 @@ a:hover {
                             </div>
                         </div>
                     </div>
-                    <%--update-begin--Author:JueYue  Date:20140616 for：首页上方可以折叠--%>
                     <div style="float: left; margin-left: 8px;margin-right: 5px; margin-top: 5px;">
                         <img src="plug-in/easyui/themes/default/images/layout_button_up.gif"
                              style="cursor:pointer" onclick="panelCollapase()" />
                     </div>
-                    <%--update-end--Author:JueYue  Date:20140616 for：首页上方可以折叠--%>
                     </div>
                 </td>
             </tr>
diff --git a/src/main/webapp/webpage/main/sliding_main.jsp b/src/main/webapp/webpage/main/sliding_main.jsp
index e2237995..31a232af 100644
--- a/src/main/webapp/webpage/main/sliding_main.jsp
+++ b/src/main/webapp/webpage/main/sliding_main.jsp
@@ -4,9 +4,7 @@
 <html>
 	<head>
 		<title>JEECG 微云快速开发平台</title>
-<%--update-begin--Author:zhangguoming  Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
 <t:base type="jquery-webos,easyui,tools,DatePicker,autocomplete"></t:base>
-<%--update-end--Author:zhangguoming  Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
 <link rel="shortcut icon" href="images/favicon.ico">
 		<link href="plug-in/sliding/css/main.css" rel="stylesheet" type="text/css" />
 		<link href="plug-in/sliding/css/themesetting.css" rel="stylesheet"  type="text/css" >
@@ -14,12 +12,8 @@
 		<link href="plug-in/sliding/css/powerFloat.css" rel="stylesheet" type="text/css"/>	
 		<link href="plug-in/sliding/css/smartMenu.css" rel="stylesheet"  type="text/css" />
 		<link href="plug-in/sliding/css/skins/opera.css" rel="stylesheet"  type="text/css" />
-        <%--update-begin--Author:zhangguoming  Date:20140604 for：云桌面全局视图，添加纵向滚动条--%>
         <link href="plug-in/sliding/css/scrollStyle.css" rel="stylesheet"  type="text/css" />
-        <%--update-end--Author:zhangguoming  Date:20140604 for：云桌面全局视图，添加纵向滚动条--%>
-        <%--update-begin--Author:zhangguoming  Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
 		<%--<script  type="text/javascript" src="plug-in/webos1.2/js/jquery-1.7.1.min.js"></script>--%>
-        <%--update-end--Author:zhangguoming  Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
 		<script  type="text/javascript" src="plug-in/sliding/js/jquery-powerFloat-min.js"></script>
 		<script  type="text/javascript" src="plug-in/sliding/js/jquery-smartMenu-min.js"></script>
 		<script  type="text/javascript" src="plug-in/sliding/js/jquery-class.js"></script>
diff --git a/src/main/webapp/webpage/system/depart/departUserList.jsp b/src/main/webapp/webpage/system/depart/departUserList.jsp
index 4519bcff..a601924a 100644
--- a/src/main/webapp/webpage/system/depart/departUserList.jsp
+++ b/src/main/webapp/webpage/system/depart/departUserList.jsp
@@ -12,5 +12,4 @@
 	<t:dgToolBar title="common.edit.param" langArg="common.user" icon="icon-edit" url="userController.do?addorupdate&departid=${departid}" funname="update"></t:dgToolBar>
     <%--update-start--Author:zhangguoming  Date:20140826 for：添加有客户--%>
 	<t:dgToolBar title="common.add.exist.user" icon="icon-add" url="departController.do?goAddUserToOrg&orgId=${departid}" funname="add" width="500"></t:dgToolBar>
-    <%--update-end--Author:zhangguoming  Date:20140826 for：添加有客户--%>
 </t:datagrid>
diff --git a/src/main/webapp/webpage/system/document/files.jsp b/src/main/webapp/webpage/system/document/files.jsp
index 97a2ffdd..9303fb3a 100644
--- a/src/main/webapp/webpage/system/document/files.jsp
+++ b/src/main/webapp/webpage/system/document/files.jsp
@@ -15,9 +15,7 @@
 		<span class="Validform_checktip">标题名称在3~50位字符,且不为空</span>
 	</div>
 	<div class="form">
-	<!-- 		update-begin--Author:huangzq  Date:20151205 for：[733]上传下载，没有编辑功能-->
 		<t:upload name="fiels" buttonText="上传文件" uploader="systemController.do?saveFiles&fileKey=${doc.id}" extend="office" id="file_upload" formData="documentTitle"></t:upload>
-	<!-- 		update-end--Author:huangzq  Date:20151205 for：[733]上传下载，没有编辑功能-->
 	</div>
 	<div class="form" id="filediv" style="height: 50px"></div>
 	</fieldset>
diff --git a/src/main/webapp/webpage/system/document/filesList.jsp b/src/main/webapp/webpage/system/document/filesList.jsp
index 10fd2c48..b8ff801d 100644
--- a/src/main/webapp/webpage/system/document/filesList.jsp
+++ b/src/main/webapp/webpage/system/document/filesList.jsp
@@ -12,8 +12,6 @@
 	<t:dgOpenOpt width="800" height="700" url="commonController.do?openViewFile&fileid={id}&subclassname={subclassname}" title="预览"></t:dgOpenOpt>
 	<t:dgDelOpt url="systemController.do?delDocument&id={id}" title="删除"></t:dgDelOpt>
 	<t:dgToolBar title="文件录入" icon="icon-add" funname="add" url="systemController.do?addFiles"></t:dgToolBar>
-	<!-- 		update-begin--Author:huangzq  Date:20151205 for：[733]上传下载，没有编辑功能-->
 	<t:dgToolBar title="编辑" icon="icon-edit" funname="update" url="systemController.do?editFiles"></t:dgToolBar>
-	<!-- 		update-end--Author:huangzq  Date:20151205 for：[733]上传下载，没有编辑功能-->
 </t:datagrid></div>
 </div>
diff --git a/src/main/webapp/webpage/system/function/function.jsp b/src/main/webapp/webpage/system/function/function.jsp
index 57c9720b..f78a2b80 100644
--- a/src/main/webapp/webpage/system/function/function.jsp
+++ b/src/main/webapp/webpage/system/function/function.jsp
@@ -103,7 +103,6 @@
             </c:forEach>
         </select>
     </div>
-    <%--update-begin--Author:zhangguoming  Date:20140509 for：云桌面图标管理--%>
     <div class="form">
         <label class="Validform_label"> <t:mutiLang langKey="desktop.icon"/>: </label>
         <select name="TSIconDesk.id">
@@ -114,7 +113,6 @@
             </c:forEach>
         </select>
     </div>
-    <%--update-end--Author:zhangguoming  Date:20140509 for：云桌面图标管理--%>
 	<div class="form" id="funorder"><label class="Validform_label"> <t:mutiLang langKey="menu.order"/>: </label> <input name="functionOrder" class="inputxt" value="${function.functionOrder}" datatype="n1-3"></div>
 	</fieldset>
 </t:formvalid> 
diff --git a/src/main/webapp/webpage/system/function/functionList.jsp b/src/main/webapp/webpage/system/function/functionList.jsp
index b9596e32..0a441f3e 100644
--- a/src/main/webapp/webpage/system/function/functionList.jsp
+++ b/src/main/webapp/webpage/system/function/functionList.jsp
@@ -17,7 +17,6 @@
         <%--   update-start--Author:anchao  Date:20130415 for：按钮权限控制--%>
         <t:dgFunOpt funname="operationDetail(id)" title="button.setting"></t:dgFunOpt>
         <t:dgFunOpt funname="operationData(id)" title="数据规则"></t:dgFunOpt>
-        <%--   update-end--Author:anchao  Date:20130415 for：按钮权限控制--%>
         <t:dgToolBar title="common.add.param" langArg="common.menu" icon="icon-add" url="functionController.do?addorupdate" funname="addFun"></t:dgToolBar>
         <t:dgToolBar title="common.edit.param" langArg="common.menu" icon="icon-edit" url="functionController.do?addorupdate" funname="update"></t:dgToolBar>
     </t:datagrid>
@@ -59,7 +58,6 @@ function operationDetail(functionId)
 	}
 	$('#operationDetailpanel').panel("refresh", "functionController.do?operation&functionId=" +functionId);
 }
-<%--   update-end--Author:anchao  Date:20130415 for：按钮权限控制--%>
 <%--   update-start--Author:jueyue  Date:20130622 for：菜单录入代入父菜单--%>
 function addFun(title,url, id) {
 	var rowData = $('#'+id).datagrid('getSelected');
@@ -68,6 +66,5 @@ function addFun(title,url, id) {
 	}
 	add(title,url,'functionList');
 }
-<%--   update-end--Author:jueyue  Date:20130622 for：菜单录入代入父菜单--%>
 </script>
 
diff --git a/src/main/webapp/webpage/system/user/user.jsp b/src/main/webapp/webpage/system/user/user.jsp
index 64bbd4b1..437d0016 100644
--- a/src/main/webapp/webpage/system/user/user.jsp
+++ b/src/main/webapp/webpage/system/user/user.jsp
@@ -66,9 +66,7 @@
 		$(function(){
 			$("#departname").prev().hide();
 		});
- <%--update-end--Author:zhangguoming  Date:20140825 for：添加组织机构combobox多选的处理方法--%>
     </script>
-    <%--update-end--Author:jg_renjie  Date:20160320 for：#942 【组件封装】组织机构弹出模式，目前是列表，得改造成树方式--%>
 </head>
 <body style="overflow-y: hidden" scroll="no">
 <%--update-start--Author:zhangguoming  Date:20140825 for：格式化页面代码 并 添加组织机构combobox多选框--%>
@@ -134,7 +132,6 @@
                 <input id="orgIds" name="orgIds" type="hidden" value="${orgIds}">
                 <a href="#" class="easyui-linkbutton" plain="true" icon="icon-search" id="departSearch" onclick="openDepartmentSelect()">选择</a>
                 <a href="#" class="easyui-linkbutton" plain="true" icon="icon-redo" id="departRedo" onclick="callbackClean()">清空</a>
-                 <%--update-end--Author:jg_renjie  Date:20160320 for：#942 【组件封装】组织机构弹出模式，目前是列表，得改造成树方式--%>
                 <span class="Validform_checktip"><t:mutiLang langKey="please.muti.department"/></span>
             </td>
 		</tr>
@@ -171,5 +168,4 @@
 		</tr>
 	</table>
 </t:formvalid>
-<%--update-end--Author:zhangguoming  Date:20140825 for：格式化页面代码 并 添加组织机构combobox多选框--%>
 </body>
\ No newline at end of file
diff --git a/src/main/webapp/webpage/system/user/userList.jsp b/src/main/webapp/webpage/system/user/userList.jsp
index d8cc5cde..a08b3774 100644
--- a/src/main/webapp/webpage/system/user/userList.jsp
+++ b/src/main/webapp/webpage/system/user/userList.jsp
@@ -25,8 +25,6 @@
        <t:departSelect></t:departSelect>
     </div>
 </div>
-<%--update-end--Author:zhangguoming  Date:20140827 for：添加 组织机构查询条件--%>
-<%--update-end--Author:lijun  Date:20160302 for：组织机构查询条件修改为使用departSelect标签--%>
 
 <t:datagrid name="userList" title="common.operation" actionUrl="userController.do?datagrid" 
     fit="true" fitColumns="true" idField="id" queryMode="group" sortName="id" sortOrder="desc">
@@ -35,7 +33,6 @@
     <%--update-start--Author:zhangguoming  Date:20140827 for：通过用户对象的关联属性值获取组织机构名称（多对多关联）--%>
 	<%--<t:dgCol title="common.department" field="TSDepart_id" query="true" replace="${departsReplace}"></t:dgCol>--%>
 	<t:dgCol title="common.department" sortable="false" field="userOrgList.tsDepart.departname" query="false"></t:dgCol>
-    <%--update-end--Author:zhangguoming  Date:20140827 for：通过用户对象的关联属性值获取组织机构名称（多对多关联）--%>
 	<t:dgCol title="common.real.name" field="realName" query="false"></t:dgCol>
 	<t:dgCol title="common.role" field="userKey" ></t:dgCol>
 	<t:dgCol title="common.createby" field="createBy" hidden="true"></t:dgCol>
@@ -175,4 +172,3 @@ function lockuploadify(url, id) {
 		JeecgExcelExport("userController.do?exportXlsByT", "userList");
 	}
 </script>
-<%--update-end--Author:zhangguoming  Date:20140827 for：添加 组织机构查询条件：弹出 选择组织机构列表 相关操作--%>