Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

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

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