Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA

liyj

2020-09-07 f7e9b835c30e5b3287b2c04e24950871cafa907d

 src/menu/menu.oa.js

@@ -180,7 +180,7 @@
        permKey: '/merits/meritsDispose',
        children: [],
        parentKey: 'merits',
      }
      },
    ],
  },
];