Merge branch 'api' into hive2.0

jyy

2021-01-26 68434f8f14a02ca70317e9cc2709c0713ef7d1e3

 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 {