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

skyouc

9 天以前 d7bb8c43b17253b46c6a466cff5545e8b4bcaad3

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

@@ -17,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;