Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

4 天以前 ecd5b6b51b7ddc4efe63c49c3c68adb276a2a2cb

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java

@@ -209,7 +209,8 @@
                if (result.getCode() == 200) {
                    return R.ok().add(result.getData());
                } else {
                    throw new CoolException("修改失败！！");
                    return R.ok(result.getMsg()).add(result.getData());
//                    throw new CoolException("修改失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());