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

skyouc

6 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java

@@ -43,7 +43,7 @@
            return R.error("上报明细不能为空！！");
        }

        return reportMsgService.reportOrders(params);
        return reportMsgService.uploadReportOrders(params);

    }