Merge remote-tracking branch 'origin/master'

wangfei

2024-11-08 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java

@@ -18,8 +18,6 @@
 */
public interface DamageService extends MPJBaseService<Damage> {

    List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);

    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);

//    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);