Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-23 a4a9d6c03b724689ae74fe5f15149af89200b5de

 src/views/operate/baseSetting/violation/updateUser/index.vue

@@ -86,8 +86,7 @@
        //                 name: role.name,
        //                 sort: 0
        //             }).then(res => {
        //                 this.$emit('changeDialog', { dialogUpdate: false });
        //                 this.getUserList();
        //                 this.$emit('changeDialog', { flag: false });
        //             })
        //         } else {
        //             return false;
@@ -125,7 +124,7 @@
                })
        }
    },
    props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
    props: ['userInfo', 'updateFlag', 'changeDialog']
}
</script>
<style lang="scss" scoped>