Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

 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 {