From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期六, 02 十一月 2024 11:18:38 +0800 Subject: [PATCH] 合并代码，解决冲突 --- src/main/webapp/views/basLift/basLift.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/webapp/views/basLift/basLift.html b/src/main/webapp/views/basLift/basLift.html index 1ce3f86..948d354 100644 --- a/src/main/webapp/views/basLift/basLift.html +++ b/src/main/webapp/views/basLift/basLift.html @@ -181,7 +181,7 @@ <!-- </div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> -<!-- <label class="layui-form-label">杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�: </label>--> +<!-- <label class="layui-form-label">杩涜緭閫佺嚎鍗¤揣鏋舵姤璀�: </label>--> <!-- <div class="layui-input-block">--> <!-- <input class="layui-input" name="inConveyLineCardTrayAlarm" placeholder="璇疯緭鍏ヨ繘杈撻�佺嚎鍗℃墭鐩樻姤璀�">--> <!-- </div>--> -- Gitblit v1.9.1