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

zc

2 天以前 2db2c1328008ae399d8d7af56c9c6dc67a47bce8

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java

@@ -81,7 +81,8 @@
                    result.setData(dto);
                    return result;
                } else {
                    throw new CoolException("查询失败！！");
                    return result;
//                    throw new CoolException("查询失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());