Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

mg

2022-10-27 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c

 src/views/systemSetting/baseSetting/role/updateUser/index.vue

@@ -8,8 +8,8 @@
                            :default-checked-keys="checkedIds" default-expand-all node-key="id">
                        </el-tree>
                    </div>
                    <div class="my-tree__bottom"></div>
                    <div class="my-tree__right"></div>
                    <!-- <div class="my-tree__bottom"></div> -->
                    <!-- <div class="my-tree__right"></div> -->
                </div>
                <div class="selection">
                    <el-button class="cancel" @click="resetRole">取消</el-button>
@@ -129,7 +129,7 @@
                border-radius: 4px;

                .my-tree__wrap {
                    overflow: scroll;
                    overflow-y: scroll;
                    height: 200px;
                }