冲突合并

web-react/src/pages/system/user/form.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import { Button, Row, Col, Form, Input, DatePicker, Radio, Table, Select, Spin, TreeSelect } from 'antd'
 import { AntIcon } from 'components'
 import { cloneDeep } from 'lodash'
-import getDicData from 'util/dic'
+import getDictData from 'util/dic'
 import { EMPTY_ID } from 'util/global'
 import { api } from 'common/api'
 import moment from 'moment'

web-react/src/pages/system/user/index.jsx

@@ -4,7 +4,7 @@ import { AntIcon, Auth, Container, Image, ModalForm, QueryList, QueryTreeLayout
 import { api } from 'common/api'
 import { toCamelCase } from 'util/format'
 import { isEqual } from 'lodash'
-import getDicData from 'util/dic'
+import getDictData from 'util/dic'
 import FormBody from './form'
 
 // 配置页面所需接口函数
@@ -60,7 +60,7 @@ export default class index extends Component {
      */
     componentDidMount() {
         this.list.current.onLoading()
-        getDicData('sex', 'common_status').then(res => {
+        getDictData('sex', 'common_status').then(res => {
             this.setState({
                 codes: res
             }, () => {