From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突
---
HTML/views/HouseWithinSetting/StockCheckLog.html | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/StockCheckLog.html b/HTML/views/HouseWithinSetting/StockCheckLog.html
index 1c52504..29674f7 100644
--- a/HTML/views/HouseWithinSetting/StockCheckLog.html
+++ b/HTML/views/HouseWithinSetting/StockCheckLog.html
@@ -78,7 +78,7 @@
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>鎼滅储
</button>
</div>
</div>
@@ -182,7 +182,6 @@
laypage = layui.laypage,
layer = layui.layer;
var h1 = GetTableHeight();
-
var TotalColsArr =
[[
--
Gitblit v1.8.0