Merge remote-tracking branch 'origin/master'

wangfei

2024-12-23 250e2cd3c6b63605d2d23d496884ff18fac5e536

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

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

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

/**