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/pda/comb.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index ada5b5c..00585ad 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -122,7 +122,7 @@
function comb() {
let barcode = $('#code').val();
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("璐ф灦鏉＄爜涓虹┖", true);
// document.getElementById("code").focus();
return;
}
--
Gitblit v1.9.1