Merge remote-tracking branch 'origin/master'

zhoushihao

4 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java

@@ -2,6 +2,7 @@

import com.mes.pp.entity.FlowCard;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.dto.FlowCardDTO;

import java.util.List;
import java.util.Map;
@@ -21,4 +22,6 @@
    List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber);

    List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber);

    List<FlowCardDTO> flowCardReportForms(String orderId);
}