diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
index 7ecf38e7..7c00e7df 100644
--- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -14,105 +14,105 @@
- <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
- data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #form:form>
+ <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
+ data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #form:form>
@@ -207,6 +207,9 @@ $('#dataGrid').dataGrid({
// 加载成功后执行事件
ajaxSuccess: function(data){
+ // 分组和冻结列情况下的合并单元格测试
+ //$('#dataGrid').dataGrid("mergeCell", "testInput,id");
+
// ================ 启用合计行 BEGIN ==============
// showFooter: true, // 是否显示底部合计行
// 第 1 种方法:请求完成之后通过js设置,举例如下: