Merge remote-tracking branch 'origin/smf-core-20592' into smf-core-20592

# Conflicts:
#	src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -707,7 +707,7 @@ public class StoragePosController {
             checkOutDto.setSingleOut(true + "");
         }
         //        判断线体是否为空
-        if (StringUtils.isEmpty(checkOutDto.getLine())) {
+        if (StringUtils.isNotEmpty(checkOutDto.getLine())) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"线体"});
         }
         String isSingleOutStr = checkOutDto.getSingleOut();