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

skyouc

2 小时以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

 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;