Merge branch 'api' into hive2.0

jyy

2021-01-25 b265b9fc41cd9de5bd36c76ec02578e1075de1d1

 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 {