Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

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

@@ -244,7 +244,9 @@
        if (checkStatus == "待审核" || checkStatus == "审核未通过") {
            //没有审核并且登入者是审核者才显示审核的按钮，
            // if ((staffId == row.appmanId)) {
            if (checkStatus == "待审核") {
                html += btns[2].replace('VALUE', value);
            }
            // }
            if (isSame) {
                html += btns[1].replace('VALUE', value);