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

gaoluyang

3 天以前 00ef76a2e286e338fa3c648ce183e3533ce006ad

 src/api/basicInformation/coal.js

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