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

gaoluyang

3 天以前 ecb800b7af57ecf5d14c41a6cf54a16c3be61094

 src/api/basicInformation/coal.js

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