Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-17 0f66a8dc0544e72b0d41adfc69db20ea584c4661

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html

@@ -633,7 +633,6 @@
            },
            //解绑
            openExamineSaleMan(row) {
                alert(this.activeName);
                this.$confirm('是否解绑?', '解绑', {
                    distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
                    confirmButtonText: '同意',