Merge branch 'api' into hive2.0

Helius

2021-01-28 f935e297274e5e75b5c16be62d14b000007ef832

 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 {