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

zjj

2 天以前 eeb96ed3c9830f996dc85cc9d4a8113aba91692b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java

@@ -18,7 +18,7 @@

    R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;

    boolean fieldsSave(Map<String, Object> params);
    boolean fieldsSave(Map<String, Object> params, Long loginUserId);

    R generateBarcode(List<Long> orders);