Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

xu-bin-bin

2023-10-17 90d9cd8ac8d7575d1cbd6e81ff6ed746ee82289f

 src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java

@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;