From 9ebb2b2124c6ea776c61da36c3cc49940895687a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 27 三月 2024 08:09:39 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/SOSetting/ComBoxInfo.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index e127a6b..5e5f425 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/HTML/views/SOSetting/ComBoxInfo.html
@@ -97,6 +97,7 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions = {
elem: '#LAY-app-content-list',
+ // height: h1,
height: 'full-100',
id: 'LAY-app-content-list',
page: true,
@@ -131,7 +132,7 @@
field: 'CreateUserName', align: 'center', title: '鍒涘缓浜�', width: 120,
},
{
- field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 165,
+ field: 'CreateTime', align: 'center', title: '鎷ｈ揣鏃堕棿', width: 165,
templet: function (d) {
return formatDate(d.CreateTime);
},
--
Gitblit v1.8.0