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

nidapeng

2024-04-01 bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4

 platform/src/components/system/role/MenuConfigWindow.vue

@@ -50,12 +50,8 @@
     * @role 角色对象
     */
    open (role) {
<<<<<<< HEAD
      if (this.userInfo.type === 1) {
        fetchTree1({})
=======
      fetchMenuList({})
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
        .then(records => {
          this.role = role
          this.menus = records