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

gaoluyang

2 天以前 9d9c62348e3296a597405e6f6416da8efc0fe18b

 src/api/basicInformation/coal.js

@@ -6,7 +6,7 @@
    return request({
        url: '/coalInfo/list',
        method: 'get',
        data: query
        params: query
    })
}