Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java

@@ -1,8 +1,8 @@
package com.ruoyi.production.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.pojo.ProductionOrderRouting;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;

import java.util.List;

@@ -10,5 +10,5 @@

    ProductionOrderRouting listMain(Long orderId);

    List<ProductionOrderRoutingOperation> listItem(Long orderId);
    List<ProductionOrderRoutingOperationVo> listItem(Long orderId);
}