Merge branch 'master' into hive2.0

wzy

2020-12-14 08e86badef73810418add083b21ba64bff74700c

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

@@ -566,7 +566,7 @@
            //获取用户列表
            AjaxProxy.requst({
                app: _this,
                url: basePath + '/admin/getShopStaffByRoleName?roleName=美疗师',
                url: basePath + '/admin/shopAll',
                callback: function (data) {
                    _this.userList = data.rows;
                }