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

gongchunyi

14 小时以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java

@@ -42,7 +42,7 @@
     */
    IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);

    int inspectionReport(List<Long> ids,String orderType);
    int inspectionReport(List<Long> ids,String orderType,String materialProp);

    int revokeInspectionReport(Long id);