Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-12 c67d54ad523bf055add4c6f0d0bc9e966bc03cbd

 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;

/**