Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 d1302c929961b5ca0ed0845ddc2d5d51373701c7

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -19,7 +19,6 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**