Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 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);