Merge branch 'feature_chw_zjw' into dev-chw

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -24,6 +24,8 @@ import java.util.Date;
 @Table(name = "base_order")
 public class BaseOrder implements Serializable {
 	private static final long serialVersionUID = 1L;
+	public static final int ORDER_TYPE_VEHICLE = 1;
+
 	public static final int ORDER_SIGN_NORMAL = 1;
 	public static final int ORDER_SIGN_APPLY = 2;
 	public static final int ORDER_SIGN_SPECIAL = 3;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -58,6 +58,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.order.entity.BaseOrder.ORDER_TYPE_VEHICLE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Controller
@@ -167,6 +169,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
         //dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        dto.setType(ORDER_TYPE_VEHICLE);
         dto.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));