Merge branch 'master-modify-background-bug-hf' into dev

.gitignore

@@ -10,7 +10,7 @@ ace-modules/ace-tool/src/main/resources/application-dev.yml
 **/src/test
 **/logs
 xx-order/xx-order-server/logs/**
-xx-order/xx-order-server/src/test/java/**
+xx-order/xx-order-server/src/test/**
 *.log
 logs/**
 /src/main/test/**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -297,6 +297,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		orderPageVo.setIllegalReserve(illegalReserve);
 		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
 			setOrderId(orderPageVo.getId());
+			setType(104);
 		}}));
 		return ObjectRestResponse.succ(orderPageVo);
 	}