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

chen.lin

2026-02-24 a40ecf9cc55abc8dafbd19391d82040b70b590c2

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

@@ -131,7 +131,8 @@
//                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
                    return result;
                } else {
                    throw new CoolException("查询失败！！");
                    return result;
//                    throw new CoolException("查询失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());