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

skyouc

9 天以前 be0589d61b2d13a12e0dc0f43591175bcae1261e

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

@@ -24,4 +24,5 @@
    R completeOrder(Long id, Long loginUserId);

    R closeOrder(Long id);

}