Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99

 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>';