Merge remote-tracking branch '公司服务器/master'

ZengTao

2024-08-16 7cb0f744250b643fd0b501db1812eed96a4e3902

 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;

/**