Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-24 031da535a58f83913db6287b5f29f5983435cfa2

 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;

/**