Merge branch 'liweidong'

2 days ago · 21465f506a
parent 7a652b2522 d655d3657f
commit 21465f506a
1 changed files with 2 additions and 1 deletions
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@ -258,7 +258,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
        }
        entity.setIsSinTerIng(true);
-
+        //展示待排产
        entity.setStatus(YieldOrderEnum.STATUS_APS.getCode());
        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
        // 获取所有父订单ID