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

liyj

2020-06-01 9628c86a6607380dbc7c0191a6055e07c6334657

 src/components/oa/merits/meritsDetail/index.jsx

@@ -175,7 +175,7 @@
      url: `api/merits/assess/findMeritsDetail`,
      formData: {
        ...formData,
        userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser'))
        userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser')).userId
      },
      key: formData.__key,
      columns: this.renderColumns(),