From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html b/zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html
index 38260b0..3bf4210 100644
--- a/zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html
@@ -87,7 +87,7 @@
</div>
<label class="col-sm-2 control-label">排序</label>
<div class="col-sm-4">
- <input autocomplete="off" name="fnSequence" type="number" class="form-control"
+ <input autocomplete="off" name="sort" type="number" class="form-control"
id="sortIndex">
</div>
</div>
@@ -150,7 +150,7 @@
initFunctionSelected(loj.getString(0,"parentId"));
$("#id").val(loj.getString(0, "id"));
$("#value").val(loj.getString(0, "value"));
- $("#sort").val(loj.getString(0, "sort"));
+ $("#sortIndex").val(loj.getString(0, "sort"));
$("#typeCode").val(loj.getString(0, "typeCode"));
});
--
Gitblit v1.9.1