Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into ...

skyouc

昨天 8ef2c9bf15e8d3b70fcf1cffe98d4f6ff0fc9ed6

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

@@ -39,7 +39,7 @@

    List<Fields> getDynamicFields();

    R getDeltByCode(Map<String, Object> params);
    R getDeltByCode(Map<String, String> params);

    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);