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

935090232@qq.com

2021-01-06 6a2d3e41099a782770f2aa0f648061ac0bd2d4ce

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -777,6 +777,7 @@
                    _this.serviceOrderTableQueryFn();
                    _this.orderTableDataQueryFn();
                    _this.skinCheckTableDataQueryFn();
                    _this.refreshTable();
                });
            },
            addLabelFn(key) {