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

liyong

14 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

 src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java

@@ -13,7 +13,7 @@
@Mapper
public interface ProductStructureMapper  extends BaseMapper<ProductStructure> {

    List<ProductStructureDto> listBybomId(@Param("bomId") Long bomId);
    List<ProductStructureDto> listBybomId(@Param("bomId") Integer bomId);

    List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Long bomId, @Param("processId") Long processId);
    List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Integer bomId, @Param("processId") Long processId);
}