From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
index fd4c63e..a3c1d02 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
@@ -181,7 +181,8 @@
             alarmNum = row.alarmNum;
         }
         var storeNum = parseInt(value);
-        if (alarmNum >= storeNum) {
+        console.log(alarmNum,storeNum);
+        if (alarmNum > storeNum) {
             html = '<span class="label-danger" >&nbsp;&nbsp;' + value
                 + '&nbsp;&nbsp;</span>';
         } else {

--
Gitblit v1.9.1