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

Mr Ke

2020-10-20 44ded758bb586d08461538d7f1c2d42d6750d977

 src/menu/menu.oa.js

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