Merge branch 'score_shop' into api_score_meger

jyy

2021-08-20 d5d3d4e6397f23782958748f46c389b85eaafe47

 zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html

@@ -161,7 +161,6 @@
            alarmNum = row.alarmNum;
        }
        var storeNum = parseInt(value);
        console.log(alarmNum,storeNum);
        if (alarmNum > storeNum) {
            html = '<span class="label-danger" >&nbsp;&nbsp;' + value
                + '&nbsp;&nbsp;</span>';